X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Ftest%2Funittests%2Ftest_resourcemodel.py;h=165893de9f3b3dbe278756bafdf8c7530a220e1d;hb=718fba45788c096641ed9d7c911375df781f20b5;hp=a1d273c08a459de141999b0228292517f95cf0c7;hpb=db31fdbb0e98d35c4852f6e0b514c4f56e7eba24;p=osm%2Fvim-emu.git diff --git a/src/emuvim/test/unittests/test_resourcemodel.py b/src/emuvim/test/unittests/test_resourcemodel.py old mode 100644 new mode 100755 index a1d273c..165893d --- a/src/emuvim/test/unittests/test_resourcemodel.py +++ b/src/emuvim/test/unittests/test_resourcemodel.py @@ -1,5 +1,6 @@ import time import os +import unittest from emuvim.test.base import SimpleTestTopology from emuvim.dcemulator.resourcemodel import BaseResourceModel, ResourceFlavor, NotEnoughResourcesAvailable, ResourceModelRegistrar from emuvim.dcemulator.resourcemodel.upb.simple import UpbSimpleCloudDcRM, UpbOverprovisioningCloudDcRM, UpbDummyRM @@ -211,15 +212,13 @@ class testUpbSimpleCloudDcRM(SimpleTestTopology): rm.free(c1) self.assertTrue(rm.dc_alloc_cu == 0) + @unittest.skipIf(os.environ.get("SON_EMU_IN_DOCKER") is not None, + "skipping test when running inside Docker container") def testInRealTopo(self): """ Start a real container and check if limitations are really passed down to Conteinernet. :return: """ - # ATTENTION: This test should only be executed if emu runs not inside a Docker container, - # because it manipulates cgroups. - if os.environ.get("SON_EMU_IN_DOCKER") is not None: - return # create network self.createNet(nswitches=0, ndatacenter=1, nhosts=2, ndockers=0) # setup links