summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conductor/conductor/tests/unit/common/__init__.py25
-rw-r--r--conductor/conductor/tests/unit/common/models/__init__.py25
-rw-r--r--conductor/conductor/tests/unit/reservation/__init__.py25
-rw-r--r--conductor/conductor/tests/unit/solver/optimizer/__init__.py25
-rw-r--r--conductor/conductor/tests/unit/solver/optimizer/test_random_pick.py8
5 files changed, 105 insertions, 3 deletions
diff --git a/conductor/conductor/tests/unit/common/__init__.py b/conductor/conductor/tests/unit/common/__init__.py
new file mode 100644
index 0000000..8e43dd8
--- /dev/null
+++ b/conductor/conductor/tests/unit/common/__init__.py
@@ -0,0 +1,25 @@
+#
+# -------------------------------------------------------------------------
+# Copyright (c) 2015-2017 AT&T Intellectual Property
+#
+# 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.
+#
+# -------------------------------------------------------------------------
+#
+
+
+class NotImplementedError(NotImplementedError):
+ # FIXME(jd) This is used by WSME to return a correct HTTP code. We should
+ # not expose it here but wrap our methods in the API to convert it to a
+ # proper HTTP error.
+ code = 501
diff --git a/conductor/conductor/tests/unit/common/models/__init__.py b/conductor/conductor/tests/unit/common/models/__init__.py
new file mode 100644
index 0000000..8e43dd8
--- /dev/null
+++ b/conductor/conductor/tests/unit/common/models/__init__.py
@@ -0,0 +1,25 @@
+#
+# -------------------------------------------------------------------------
+# Copyright (c) 2015-2017 AT&T Intellectual Property
+#
+# 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.
+#
+# -------------------------------------------------------------------------
+#
+
+
+class NotImplementedError(NotImplementedError):
+ # FIXME(jd) This is used by WSME to return a correct HTTP code. We should
+ # not expose it here but wrap our methods in the API to convert it to a
+ # proper HTTP error.
+ code = 501
diff --git a/conductor/conductor/tests/unit/reservation/__init__.py b/conductor/conductor/tests/unit/reservation/__init__.py
new file mode 100644
index 0000000..8e43dd8
--- /dev/null
+++ b/conductor/conductor/tests/unit/reservation/__init__.py
@@ -0,0 +1,25 @@
+#
+# -------------------------------------------------------------------------
+# Copyright (c) 2015-2017 AT&T Intellectual Property
+#
+# 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.
+#
+# -------------------------------------------------------------------------
+#
+
+
+class NotImplementedError(NotImplementedError):
+ # FIXME(jd) This is used by WSME to return a correct HTTP code. We should
+ # not expose it here but wrap our methods in the API to convert it to a
+ # proper HTTP error.
+ code = 501
diff --git a/conductor/conductor/tests/unit/solver/optimizer/__init__.py b/conductor/conductor/tests/unit/solver/optimizer/__init__.py
new file mode 100644
index 0000000..8e43dd8
--- /dev/null
+++ b/conductor/conductor/tests/unit/solver/optimizer/__init__.py
@@ -0,0 +1,25 @@
+#
+# -------------------------------------------------------------------------
+# Copyright (c) 2015-2017 AT&T Intellectual Property
+#
+# 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.
+#
+# -------------------------------------------------------------------------
+#
+
+
+class NotImplementedError(NotImplementedError):
+ # FIXME(jd) This is used by WSME to return a correct HTTP code. We should
+ # not expose it here but wrap our methods in the API to convert it to a
+ # proper HTTP error.
+ code = 501
diff --git a/conductor/conductor/tests/unit/solver/optimizer/test_random_pick.py b/conductor/conductor/tests/unit/solver/optimizer/test_random_pick.py
index fff65b5..4a0dd8b 100644
--- a/conductor/conductor/tests/unit/solver/optimizer/test_random_pick.py
+++ b/conductor/conductor/tests/unit/solver/optimizer/test_random_pick.py
@@ -22,13 +22,15 @@
import unittest
from conductor.common.music import api
from conductor.solver.optimizer.random_pick import RandomPick
-from conductor.solver.request import demand
from oslo_config import cfg
-
+from mock import patch
class TestRandomPick(unittest.TestCase):
- def setUp(self):
+ @patch('conductor.solver.optimizer')
+ @patch('conductor.common.music.model.base.Base.table_create')
+ @patch('conductor.common.music.model.base.Base.insert')
+ def setUp(self, conf, _requests=None, _begin_time=None):
self.music = api.API()
self.conf = cfg.CONF
self.randomPick = RandomPick(self.conf)