diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f1772fca14..4f2909a924 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,10 +9,10 @@ steps: - script: python3 -m pip install --upgrade pip setuptools displayName: 'Install python tools' - script: | - make easy-install - export PATH=$HOME/.nni/bin:$PATH + ./install.sh displayName: 'Install dependencies' - script: | cd test/naive - PATH=$HOME/.local/nni/node/bin:$PATH python3 run.py + source ~/.bashrc + python3 run.py displayName: 'Run tests' diff --git a/test/naive/run.py b/test/naive/run.py index f199e4ece4..6932321fa3 100644 --- a/test/naive/run.py +++ b/test/naive/run.py @@ -44,16 +44,17 @@ def remove_files(self, file_list): with contextlib.suppress(FileNotFoundError): os.remove(file_path) - def run(self): - os.environ['PATH'] = os.environ['PATH'] + ':' + os.environ['PWD'] - sdk_path = os.path.abspath('../../src/sdk/pynni') - cmd_path = os.path.abspath('../../tools') - pypath = os.environ.get('PYTHONPATH') - if pypath: - pypath = ':'.join([pypath, sdk_path, cmd_path]) - else: - pypath = ':'.join([sdk_path, cmd_path]) - os.environ['PYTHONPATH'] = pypath + def run(self, installed = True): + if not installed: + os.environ['PATH'] = os.environ['PATH'] + ':' + os.environ['PWD'] + sdk_path = os.path.abspath('../../src/sdk/pynni') + cmd_path = os.path.abspath('../../tools') + pypath = os.environ.get('PYTHONPATH') + if pypath: + pypath = ':'.join([pypath, sdk_path, cmd_path]) + else: + pypath = ':'.join([sdk_path, cmd_path]) + os.environ['PYTHONPATH'] = pypath to_remove = ['tuner_search_space.json', 'tuner_result.txt', 'assessor_result.txt'] self.remove_files(to_remove) @@ -105,10 +106,10 @@ def run(self): assert assessor_result == expected, 'Bad assessor result' if __name__ == '__main__': - + installed = (sys.argv[-1] != '--preinstall') ic = Integration_test() try: - ic.run() + ic.run(installed) # TODO: check the output of rest server print(GREEN + 'PASS' + CLEAR) except Exception as error: