Skip to content

Commit 374a0d9

Browse files
committed
Change MagicMock to Mock, Add test.sh
1 parent 869eb60 commit 374a0d9

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

test.sh

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
python -m unittest test_prediction test_psutil

test_prediction.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from prediction import predictUserLoad
22
from utils import *
33
import unittest
4-
from mock import MagicMock
4+
from mock import Mock
55

66

77
class TestPredictionMethod(unittest.TestCase):
@@ -14,7 +14,7 @@ def setUp(self):
1414
avg_ram=20.0, max_ram=25.4,
1515
run_time="2017-4-8 11:25:00"
1616
)
17-
self.jsample_repo.statistic = MagicMock(
17+
self.jsample_repo.statistic = Mock(
1818
return_value=self.stat
1919
)
2020

@@ -24,7 +24,7 @@ def setUp(self):
2424
self.user = User(1000, "user1", "server1")
2525

2626
def test_predictUserLoad_UserExist(self):
27-
self.pred_repo.exist = MagicMock(
27+
self.pred_repo.exist = Mock(
2828
return_value=True
2929
)
3030

@@ -37,11 +37,11 @@ def test_predictUserLoad_UserExist(self):
3737
)
3838
pred = Prediction(newuser, newstat)
3939

40-
self.pred_repo.get = MagicMock(
40+
self.pred_repo.get = Mock(
4141
return_value=pred
4242
)
43-
self.pred_repo.update = MagicMock()
44-
self.jsample_repo.deleteUidsEarlierThan = MagicMock()
43+
self.pred_repo.update = Mock()
44+
self.jsample_repo.deleteUidsEarlierThan = Mock()
4545

4646
predictUserLoad(self.user, self.jsample_repo,
4747
self.pred_repo)
@@ -56,10 +56,10 @@ def test_predictUserLoad_UserExist(self):
5656
self.assertEqual(pred.last_login, "2017-4-8 11:25:00")
5757

5858
def test_predictUserLoad_UserNotExist(self):
59-
self.pred_repo.exist = MagicMock(
59+
self.pred_repo.exist = Mock(
6060
return_value=False
6161
)
62-
self.pred_repo.add = MagicMock()
62+
self.pred_repo.add = Mock()
6363

6464
predictUserLoad(self.user, self.jsample_repo,
6565
self.pred_repo)

test_prediction.pyc

2.57 KB
Binary file not shown.

test_psutil.pyc

3.43 KB
Binary file not shown.

test_utils.pyc

674 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)