Skip to content

Commit d6ff14f

Browse files
committed
separate functional tests from unit tests
1 parent 1bf5cfe commit d6ff14f

13 files changed

+19
-13
lines changed

.vscode/settings.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
"test_*.py"
88
],
99
"python.unitTest.unittestEnabled": true,
10-
"python.pythonPath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\Python36_64\\python.exe"
10+
"python.pythonPath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\Python36_64\\python.exe",
11+
"python.linting.enabled": true,
12+
"python.linting.pylintEnabled": true
1113
}

fullcyclepy/FullCyclePython.pyproj

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<SchemaVersion>2.0</SchemaVersion>
66
<ProjectGuid>{7dfacff8-8abe-4af3-8c58-61a88ae44e0d}</ProjectGuid>
77
<ProjectHome />
8-
<StartupFile>tests\test_config.py</StartupFile>
8+
<StartupFile>tests\func_config.py</StartupFile>
99
<SearchPath />
1010
<WorkingDirectory>.</WorkingDirectory>
1111
<OutputPath>.</OutputPath>
@@ -211,25 +211,25 @@
211211
<Compile Include="tests\test_app.py">
212212
<SubType>Code</SubType>
213213
</Compile>
214-
<Compile Include="tests\test_broadcast.py">
214+
<Compile Include="tests\func_broadcast.py">
215215
<SubType>Code</SubType>
216216
</Compile>
217217
<Compile Include="tests\test_bus.py">
218218
<SubType>Code</SubType>
219219
</Compile>
220-
<Compile Include="tests\test_config.py">
220+
<Compile Include="tests\func_config.py">
221221
<SubType>Code</SubType>
222222
</Compile>
223-
<Compile Include="tests\test_db.py">
223+
<Compile Include="tests\func_db.py">
224224
<SubType>Code</SubType>
225225
</Compile>
226226
<Compile Include="tests\test_json_message.py">
227227
<SubType>Code</SubType>
228228
</Compile>
229-
<Compile Include="tests\test_logging.py">
229+
<Compile Include="tests\func_logging.py">
230230
<SubType>Code</SubType>
231231
</Compile>
232-
<Compile Include="tests\test_miner.py">
232+
<Compile Include="tests\func_miner.py">
233233
<SubType>Code</SubType>
234234
</Compile>
235235
<Compile Include="tests\test_minerapi.py">
@@ -238,13 +238,13 @@
238238
<Compile Include="tests\test_mining.py">
239239
<SubType>Code</SubType>
240240
</Compile>
241-
<Compile Include="tests\test_minersummary.py">
241+
<Compile Include="tests\func_minersummary.py">
242242
<SubType>Code</SubType>
243243
</Compile>
244244
<Compile Include="tests\test_pools.py">
245245
<SubType>Code</SubType>
246246
</Compile>
247-
<Compile Include="tests\test_pushmonitor.py">
247+
<Compile Include="tests\func_pushmonitor.py">
248248
<SubType>Code</SubType>
249249
</Compile>
250250
<Compile Include="tests\test_queuenames.py">
@@ -253,17 +253,17 @@
253253
<Compile Include="tests\test_rules.py">
254254
<SubType>Code</SubType>
255255
</Compile>
256-
<Compile Include="tests\test_save.py">
256+
<Compile Include="tests\func_save.py">
257257
<SubType>Code</SubType>
258258
</Compile>
259259
<Compile Include="tests\test_taskscheduler.py">
260260
<SubType>Code</SubType>
261261
</Compile>
262-
<Compile Include="tests\test_telegram.py" />
262+
<Compile Include="tests\func_telegram.py" />
263263
<Compile Include="backend\when_email.py">
264264
<SubType>Code</SubType>
265265
</Compile>
266-
<Compile Include="tests\test_temperature.py">
266+
<Compile Include="tests\func_temperature.py">
267267
<SubType>Code</SubType>
268268
</Compile>
269269
<Compile Include="tests\__init__.py" />
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

fullcyclepy/tests/test_queuenames.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import unittest
2-
from helpers.queuehelper import QueueName
2+
from helpers.queuehelper import QueueName, QueueType
33

44
class TestQueuenames(unittest.TestCase):
55
def test_queue_valid_name(self):
@@ -14,5 +14,9 @@ def test_queue_alert(self):
1414
def test_queue_value(self):
1515
self.assertTrue(QueueName.value(QueueName.Q_ALERT) == 'alert')
1616

17+
def test_queue_type(self):
18+
self.assertTrue(QueueType.broadcast == 'broadcast')
19+
self.assertTrue(QueueType.publish == 'publish')
20+
1721
if __name__ == '__main__':
1822
unittest.main()

0 commit comments

Comments
 (0)