From 962cdb66590b9f9ec57e0a6aa5d0cb359bb8f145 Mon Sep 17 00:00:00 2001 From: Andrey Zelenkov Date: Mon, 16 Sep 2019 15:37:32 +0300 Subject: [PATCH] Tests: prepare_env() introduced. --- test/unit/applications/lang/go.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py index e4ab8ffa..35ceefa7 100644 --- a/test/unit/applications/lang/go.py +++ b/test/unit/applications/lang/go.py @@ -4,13 +4,10 @@ from unit.applications.proto import TestApplicationProto class TestApplicationGo(TestApplicationProto): - def load(self, script, name='app'): - - if not os.path.isdir(self.testdir + '/go'): + def prepare_env(self, script, name): + if not os.path.exists(self.testdir + '/go'): os.mkdir(self.testdir + '/go') - go_app_path = self.current_dir + '/go/' - env = os.environ.copy() env['GOPATH'] = self.pardir + '/go' process = Popen( @@ -19,12 +16,18 @@ class TestApplicationGo(TestApplicationProto): 'build', '-o', self.testdir + '/go/' + name, - go_app_path + script + '/' + name + '.go', + self.current_dir + '/go/' + script + '/' + name + '.go', ], env=env, ) + process.communicate() + return process + + def load(self, script, name='app'): + self.prepare_env(script, name) + self._load_conf( { "listeners": {"*:7080": {"pass": "applications/" + script}}, @@ -32,8 +35,10 @@ class TestApplicationGo(TestApplicationProto): script: { "type": "external", "processes": {"spare": 0}, - "working_directory": go_app_path + script, - "executable": self.testdir + '/go/' + name, + "working_directory": self.current_dir + + "/go/" + + script, + "executable": self.testdir + "/go/" + name, } }, }