X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=tests%2Fbase.py;h=3ae5f4f29f46b23ba8a47d7f38b17954050c6cfa;hp=41fa191425a4e3476469bacfad74a1b8356a7400;hb=caf6efba68120623038efc361cf46e1f60de452b;hpb=7bf2f4d5ba51d8a6909a8709aeda200ddb153b03 diff --git a/tests/base.py b/tests/base.py index 41fa191..3ae5f4f 100644 --- a/tests/base.py +++ b/tests/base.py @@ -568,12 +568,17 @@ class TestN2VC(object): ) subprocess.check_call(shlex.split(cmd)) - self.artifacts[charm] = { - 'tmpdir': builds, - 'charm': "{}/builds/{}".format(builds, charm), - } except subprocess.CalledProcessError as e: - raise Exception("charm build failed: {}.".format(e)) + # charm build will return error code 100 if the charm fails + # the auto-run of charm proof, which we can safely ignore for + # our CI charms. + if e.returncode != 100: + raise Exception("charm build failed: {}.".format(e)) + + self.artifacts[charm] = { + 'tmpdir': builds, + 'charm': "{}/builds/{}".format(builds, charm), + } return self.artifacts[charm]['charm'] @@ -902,6 +907,7 @@ class TestN2VC(object): application, ): break + await self.n2vc.DestroyNetworkService(self.ns_name) # Need to wait for the charm to finish, because native charms if self.state[application]['container']: