diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-10-05 12:05:08 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-10-05 14:51:53 +0200 |
commit | 2243607b6c4bb3a2672e2cdb7d6353d3455454a5 (patch) | |
tree | a515a6254031e651befacfd99f38b6691e722975 | |
parent | d2d72bbb71c3f772d099765ba1b06f8cf3060392 (diff) |
Set defaut provider to local back
It apply the same rules as sonuoboy.
Any user is free to set skeleton or something else via testcases.yml.
Change-Id: Id999dfd5fbcf9bde9430e0f35c63c41e80c8044f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit b100b1254e06719bf1c779b9d53d0ac2da67fca4)
-rw-r--r-- | functest_kubernetes/k8stest.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py index 34c8ab94..bbfc5376 100644 --- a/functest_kubernetes/k8stest.py +++ b/functest_kubernetes/k8stest.py @@ -60,7 +60,8 @@ class E2ETesting(testcase.TestCase): 'ginkgo', '--nodes={}'.format(kwargs.get("nodes", 1)), '--noColor', '/usr/local/bin/e2e.test', '--', '-kubeconfig', self.config, - '-provider', 'skeleton', '-report-dir', self.res_dir] + '-provider', kwargs.get('provider', 'local'), + '-report-dir', self.res_dir] for arg in kwargs.get("ginkgo", {}): cmd_line.extend(['-ginkgo.{}'.format(arg), kwargs["ginkgo"][arg]]) for key, value in self.convert_ini_to_dict( @@ -80,7 +81,7 @@ class E2ETesting(testcase.TestCase): boutput = process.stdout.read() with open(os.path.join( self.res_dir, 'e2e.log'), 'w', encoding='utf-8') as foutput: - foutput.write(boutput) + foutput.write(boutput.decode("utf-8")) grp = re.search( r'^(FAIL|SUCCESS)!.* ([0-9]+) Passed \| ([0-9]+) Failed \|' r' ([0-9]+) Pending \| ([0-9]+) Skipped', |