diff --git a/neat/global/__init__.py b/neat/globals/__init__.py similarity index 100% rename from neat/global/__init__.py rename to neat/globals/__init__.py diff --git a/neat/global/manager.py b/neat/globals/manager.py similarity index 100% rename from neat/global/manager.py rename to neat/globals/manager.py diff --git a/neat/local/__init__.py b/neat/locals/__init__.py similarity index 100% rename from neat/local/__init__.py rename to neat/locals/__init__.py diff --git a/neat/local/collector.py b/neat/locals/collector.py similarity index 100% rename from neat/local/collector.py rename to neat/locals/collector.py diff --git a/neat/local/manager.py b/neat/locals/manager.py similarity index 100% rename from neat/local/manager.py rename to neat/locals/manager.py diff --git a/neat/local/overload/__init__.py b/neat/locals/overload/__init__.py similarity index 100% rename from neat/local/overload/__init__.py rename to neat/locals/overload/__init__.py diff --git a/neat/local/overload/mhod/__init__.py b/neat/locals/overload/mhod/__init__.py similarity index 100% rename from neat/local/overload/mhod/__init__.py rename to neat/locals/overload/mhod/__init__.py diff --git a/neat/local/overload/mhod/bruteforce.py b/neat/locals/overload/mhod/bruteforce.py similarity index 100% rename from neat/local/overload/mhod/bruteforce.py rename to neat/locals/overload/mhod/bruteforce.py diff --git a/neat/local/overload/mhod/core.py b/neat/locals/overload/mhod/core.py similarity index 97% rename from neat/local/overload/mhod/core.py rename to neat/locals/overload/mhod/core.py index 2399503..65ec4a4 100644 --- a/neat/local/overload/mhod/core.py +++ b/neat/locals/overload/mhod/core.py @@ -18,9 +18,9 @@ from contracts import contract from neat.contracts_extra import * -import neat.local.overload.mhod.multisize_estimation as estimation -import neat.local.overload.mhod.bruteforce as bruteforce -from neat.local.overload.mhod.l_2_states import ls +import neat.locals.overload.mhod.multisize_estimation as estimation +import neat.locals.overload.mhod.bruteforce as bruteforce +from neat.locals.overload.mhod.l_2_states import ls @contract diff --git a/neat/local/overload/mhod/l_2_states.py b/neat/locals/overload/mhod/l_2_states.py similarity index 100% rename from neat/local/overload/mhod/l_2_states.py rename to neat/locals/overload/mhod/l_2_states.py diff --git a/neat/local/overload/mhod/multisize_estimation.py b/neat/locals/overload/mhod/multisize_estimation.py similarity index 100% rename from neat/local/overload/mhod/multisize_estimation.py rename to neat/locals/overload/mhod/multisize_estimation.py diff --git a/neat/local/overload/mhod/nlp.py b/neat/locals/overload/mhod/nlp.py similarity index 100% rename from neat/local/overload/mhod/nlp.py rename to neat/locals/overload/mhod/nlp.py diff --git a/neat/local/overload/otf.py b/neat/locals/overload/otf.py similarity index 100% rename from neat/local/overload/otf.py rename to neat/locals/overload/otf.py diff --git a/neat/local/overload/statistics.py b/neat/locals/overload/statistics.py similarity index 100% rename from neat/local/overload/statistics.py rename to neat/locals/overload/statistics.py diff --git a/neat/local/overload/trivial.py b/neat/locals/overload/trivial.py similarity index 100% rename from neat/local/overload/trivial.py rename to neat/locals/overload/trivial.py diff --git a/neat/local/underload/__init__.py b/neat/locals/underload/__init__.py similarity index 100% rename from neat/local/underload/__init__.py rename to neat/locals/underload/__init__.py diff --git a/neat/local/underload/trivial.py b/neat/locals/underload/trivial.py similarity index 100% rename from neat/local/underload/trivial.py rename to neat/locals/underload/trivial.py diff --git a/neat/local/vm_selection/__init__.py b/neat/locals/vm_selection/__init__.py similarity index 100% rename from neat/local/vm_selection/__init__.py rename to neat/locals/vm_selection/__init__.py diff --git a/neat/local/vm_selection/algorithms.py b/neat/locals/vm_selection/algorithms.py similarity index 100% rename from neat/local/vm_selection/algorithms.py rename to neat/locals/vm_selection/algorithms.py diff --git a/tests/global/test_manager.py b/tests/global/test_manager.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/global/__init__.py b/tests/globals/__init__.py similarity index 100% rename from tests/global/__init__.py rename to tests/globals/__init__.py diff --git a/tests/globals/test_manager.py b/tests/globals/test_manager.py new file mode 100644 index 0000000..78f91a7 --- /dev/null +++ b/tests/globals/test_manager.py @@ -0,0 +1,39 @@ +# Copyright 2012 Anton Beloglazov +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from mocktest import * +from pyqcy import * + +import neat.globals.manager as manager + + +class GlobalManager(TestCase): + + @qc(10) + def start( + iterations=int_(min=0, max=10), + time_interval=int_(min=0) + ): + with MockTransaction: + state = {'property': 'value'} + config = {'local_manager_interval': time_interval} + paths = [manager.DEFAILT_CONFIG_PATH, manager.CONFIG_PATH] + fields = manager.REQUIRED_FIELDS + expect(manager).read_and_validate_config(paths, fields). \ + and_return(config).once() + expect(common).start(manager.init_state, + manager.execute, + config, + time_interval).and_return(state).once() + assert manager.start() == state diff --git a/tests/local/__init__.py b/tests/locals/__init__.py similarity index 100% rename from tests/local/__init__.py rename to tests/locals/__init__.py diff --git a/tests/local/overload/__init__.py b/tests/locals/overload/__init__.py similarity index 100% rename from tests/local/overload/__init__.py rename to tests/locals/overload/__init__.py diff --git a/tests/local/overload/mhod/__init__.py b/tests/locals/overload/mhod/__init__.py similarity index 100% rename from tests/local/overload/mhod/__init__.py rename to tests/locals/overload/mhod/__init__.py diff --git a/tests/local/overload/mhod/test_bruteforce.py b/tests/locals/overload/mhod/test_bruteforce.py similarity index 96% rename from tests/local/overload/mhod/test_bruteforce.py rename to tests/locals/overload/mhod/test_bruteforce.py index c96bbd4..c71b6dd 100644 --- a/tests/local/overload/mhod/test_bruteforce.py +++ b/tests/locals/overload/mhod/test_bruteforce.py @@ -17,8 +17,8 @@ from pyqcy import * from operator import le -import neat.local.overload.mhod.bruteforce as b -import neat.local.overload.mhod.nlp as nlp +import neat.locals.overload.mhod.bruteforce as b +import neat.locals.overload.mhod.nlp as nlp class Bruteforce(TestCase): diff --git a/tests/local/overload/mhod/test_core.py b/tests/locals/overload/mhod/test_core.py similarity index 99% rename from tests/local/overload/mhod/test_core.py rename to tests/locals/overload/mhod/test_core.py index edb13de..5b23be1 100644 --- a/tests/local/overload/mhod/test_core.py +++ b/tests/locals/overload/mhod/test_core.py @@ -15,7 +15,7 @@ from mocktest import * from pyqcy import * -import neat.local.overload.mhod.core as c +import neat.locals.overload.mhod.core as c class Core(TestCase): diff --git a/tests/local/overload/mhod/test_l_2_states.py b/tests/locals/overload/mhod/test_l_2_states.py similarity index 95% rename from tests/local/overload/mhod/test_l_2_states.py rename to tests/locals/overload/mhod/test_l_2_states.py index da51f67..c9475c2 100644 --- a/tests/local/overload/mhod/test_l_2_states.py +++ b/tests/locals/overload/mhod/test_l_2_states.py @@ -15,7 +15,7 @@ from mocktest import * from pyqcy import * -import neat.local.overload.mhod.l_2_states as l +import neat.locals.overload.mhod.l_2_states as l class L2States(TestCase): diff --git a/tests/local/overload/mhod/test_multisize_estimation.py b/tests/locals/overload/mhod/test_multisize_estimation.py similarity index 99% rename from tests/local/overload/mhod/test_multisize_estimation.py rename to tests/locals/overload/mhod/test_multisize_estimation.py index 62c85c9..352dacc 100644 --- a/tests/local/overload/mhod/test_multisize_estimation.py +++ b/tests/locals/overload/mhod/test_multisize_estimation.py @@ -18,7 +18,7 @@ from pyqcy import * from collections import deque from copy import deepcopy -import neat.local.overload.mhod.multisize_estimation as m +import neat.locals.overload.mhod.multisize_estimation as m def c(data): diff --git a/tests/local/overload/mhod/test_nlp.py b/tests/locals/overload/mhod/test_nlp.py similarity index 98% rename from tests/local/overload/mhod/test_nlp.py rename to tests/locals/overload/mhod/test_nlp.py index 2b669db..baed64c 100644 --- a/tests/local/overload/mhod/test_nlp.py +++ b/tests/locals/overload/mhod/test_nlp.py @@ -17,7 +17,7 @@ from pyqcy import * import operator -import neat.local.overload.mhod.nlp as nlp +import neat.locals.overload.mhod.nlp as nlp class Nlp(TestCase): diff --git a/tests/local/overload/test_otf.py b/tests/locals/overload/test_otf.py similarity index 99% rename from tests/local/overload/test_otf.py rename to tests/locals/overload/test_otf.py index e3a4999..f08cc5d 100644 --- a/tests/local/overload/test_otf.py +++ b/tests/locals/overload/test_otf.py @@ -15,7 +15,7 @@ from mocktest import * from pyqcy import * -import neat.local.overload.otf as otf +import neat.locals.overload.otf as otf class Otf(TestCase): diff --git a/tests/local/overload/test_statistics.py b/tests/locals/overload/test_statistics.py similarity index 99% rename from tests/local/overload/test_statistics.py rename to tests/locals/overload/test_statistics.py index b4ba5fc..afafe30 100644 --- a/tests/local/overload/test_statistics.py +++ b/tests/locals/overload/test_statistics.py @@ -15,7 +15,7 @@ from mocktest import * from pyqcy import * -import neat.local.overload.statistics as stats +import neat.locals.overload.statistics as stats class Statistics(TestCase): diff --git a/tests/local/overload/test_trivial.py b/tests/locals/overload/test_trivial.py similarity index 97% rename from tests/local/overload/test_trivial.py rename to tests/locals/overload/test_trivial.py index 64758d4..ba65f45 100644 --- a/tests/local/overload/test_trivial.py +++ b/tests/locals/overload/test_trivial.py @@ -15,7 +15,7 @@ from mocktest import * from pyqcy import * -import neat.local.overload.trivial as trivial +import neat.locals.overload.trivial as trivial class Trivial(TestCase): diff --git a/tests/local/test_collector.py b/tests/locals/test_collector.py similarity index 99% rename from tests/local/test_collector.py rename to tests/locals/test_collector.py index a398d14..6d4463f 100644 --- a/tests/local/test_collector.py +++ b/tests/locals/test_collector.py @@ -20,7 +20,7 @@ import shutil import libvirt import neat.common as common -import neat.local.collector as collector +import neat.locals.collector as collector import neat.db_utils as db_utils diff --git a/tests/local/test_manager.py b/tests/locals/test_manager.py similarity index 98% rename from tests/local/test_manager.py rename to tests/locals/test_manager.py index 2bb6c92..bfcfb12 100644 --- a/tests/local/test_manager.py +++ b/tests/locals/test_manager.py @@ -19,8 +19,8 @@ import shutil import libvirt import neat.common as common -import neat.local.collector as collector -import neat.local.manager as manager +import neat.locals.collector as collector +import neat.locals.manager as manager class LocalManager(TestCase): diff --git a/tests/local/underload/__init__.py b/tests/locals/underload/__init__.py similarity index 100% rename from tests/local/underload/__init__.py rename to tests/locals/underload/__init__.py diff --git a/tests/local/underload/test_trivial.py b/tests/locals/underload/test_trivial.py similarity index 71% rename from tests/local/underload/test_trivial.py rename to tests/locals/underload/test_trivial.py index 370e93f..ef007cf 100644 --- a/tests/local/underload/test_trivial.py +++ b/tests/locals/underload/test_trivial.py @@ -15,7 +15,7 @@ from mocktest import * from pyqcy import * -import neat.local.underload.trivial as trivial +import neat.locals.underload.trivial as trivial class Trivial(TestCase): @@ -30,9 +30,9 @@ class Trivial(TestCase): self.assertEqual(alg([0.0, 1.0]), (False, {})) def test_threshold(self): - assert trivial.threshold(0.5, []) == False - assert trivial.threshold(0.5, [0.0, 0.0]) == True - assert trivial.threshold(0.5, [0.0, 0.4]) == True - assert trivial.threshold(0.5, [0.0, 0.5]) == True - assert trivial.threshold(0.5, [0.0, 0.6]) == False - assert trivial.threshold(0.5, [0.0, 1.0]) == False + self.assertEqual(trivial.threshold(0.5, []), False) + self.assertEqual(trivial.threshold(0.5, [0.0, 0.0]), True) + self.assertEqual(trivial.threshold(0.5, [0.0, 0.4]), True) + self.assertEqual(trivial.threshold(0.5, [0.0, 0.5]), True) + self.assertEqual(trivial.threshold(0.5, [0.0, 0.6]), False) + self.assertEqual(trivial.threshold(0.5, [0.0, 1.0]), False) diff --git a/tests/local/vm_selection/__init__.py b/tests/locals/vm_selection/__init__.py similarity index 100% rename from tests/local/vm_selection/__init__.py rename to tests/locals/vm_selection/__init__.py diff --git a/tests/local/vm_selection/test_algorithms.py b/tests/locals/vm_selection/test_algorithms.py similarity index 98% rename from tests/local/vm_selection/test_algorithms.py rename to tests/locals/vm_selection/test_algorithms.py index 390a212..a723d3e 100644 --- a/tests/local/vm_selection/test_algorithms.py +++ b/tests/locals/vm_selection/test_algorithms.py @@ -15,7 +15,7 @@ from mocktest import * from pyqcy import * -import neat.local.vm_selection.algorithms as selection +import neat.locals.vm_selection.algorithms as selection class Selection(TestCase):