diff --git a/.travis.yml b/.travis.yml index 629fc398db..d850637d24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ install: # command to run tests script: - pep8 mycroft test - - nose2 test --with-coverage --config=test/unittest.cfg + - nose2 -t ./ -s test/unittests/ --with-coverage --config=test/unittests/unittest.cfg env: - IS_TRAVIS=true diff --git a/test/__init__.py b/test/integrationtests/__init__.py similarity index 100% rename from test/__init__.py rename to test/integrationtests/__init__.py diff --git a/test/util/__init__.py b/test/integrationtests/skills/__init__.py similarity index 100% rename from test/util/__init__.py rename to test/integrationtests/skills/__init__.py diff --git a/test/skills/discover_tests.py b/test/integrationtests/skills/discover_tests.py similarity index 92% rename from test/skills/discover_tests.py rename to test/integrationtests/skills/discover_tests.py index d41a39fda6..c72aa5c736 100644 --- a/test/skills/discover_tests.py +++ b/test/integrationtests/skills/discover_tests.py @@ -1,7 +1,8 @@ import os import glob import unittest -from test.skills.skill_tester import MockSkillsLoader, SkillTest +from test.integrationtests.skills.skill_tester import MockSkillsLoader +from test.integrationtests.skills.skill_tester import SkillTest __author__ = 'seanfitz' diff --git a/test/skills/skill_tester.py b/test/integrationtests/skills/skill_tester.py similarity index 100% rename from test/skills/skill_tester.py rename to test/integrationtests/skills/skill_tester.py diff --git a/test/regex_test/invalid/none.rx b/test/unittests/__init__.py similarity index 100% rename from test/regex_test/invalid/none.rx rename to test/unittests/__init__.py diff --git a/test/client/__init__.py b/test/unittests/client/__init__.py similarity index 100% rename from test/client/__init__.py rename to test/unittests/client/__init__.py diff --git a/test/client/audio_consumer_test.py b/test/unittests/client/audio_consumer_test.py similarity index 98% rename from test/client/audio_consumer_test.py rename to test/unittests/client/audio_consumer_test.py index 1b5c3a52f1..4e588bf4b3 100644 --- a/test/client/audio_consumer_test.py +++ b/test/unittests/client/audio_consumer_test.py @@ -66,7 +66,8 @@ class AudioConsumerTest(unittest.TestCase): def __create_sample_from_test_file(self, sample_name): root_dir = dirname(dirname(dirname(__file__))) filename = join( - root_dir, 'test', 'client', 'data', sample_name + '.wav') + root_dir, 'unittests', 'client', + 'data', sample_name + '.wav') wavfile = WavFile(filename) with wavfile as source: return AudioData( diff --git a/test/client/data/hey_mycroft.wav b/test/unittests/client/data/hey_mycroft.wav similarity index 100% rename from test/client/data/hey_mycroft.wav rename to test/unittests/client/data/hey_mycroft.wav diff --git a/test/client/data/mycroft.wav b/test/unittests/client/data/mycroft.wav similarity index 100% rename from test/client/data/mycroft.wav rename to test/unittests/client/data/mycroft.wav diff --git a/test/client/data/mycroft_wakeup.wav b/test/unittests/client/data/mycroft_wakeup.wav similarity index 100% rename from test/client/data/mycroft_wakeup.wav rename to test/unittests/client/data/mycroft_wakeup.wav diff --git a/test/client/data/record.wav b/test/unittests/client/data/record.wav similarity index 100% rename from test/client/data/record.wav rename to test/unittests/client/data/record.wav diff --git a/test/client/data/stop.wav b/test/unittests/client/data/stop.wav similarity index 100% rename from test/client/data/stop.wav rename to test/unittests/client/data/stop.wav diff --git a/test/client/data/weather_mycroft.wav b/test/unittests/client/data/weather_mycroft.wav similarity index 100% rename from test/client/data/weather_mycroft.wav rename to test/unittests/client/data/weather_mycroft.wav diff --git a/test/client/dynamic_energy_test.py b/test/unittests/client/dynamic_energy_test.py similarity index 100% rename from test/client/dynamic_energy_test.py rename to test/unittests/client/dynamic_energy_test.py diff --git a/test/client/local_recognizer_test.py b/test/unittests/client/local_recognizer_test.py similarity index 100% rename from test/client/local_recognizer_test.py rename to test/unittests/client/local_recognizer_test.py diff --git a/test/configuration/__init__.py b/test/unittests/configuration/__init__.py similarity index 100% rename from test/configuration/__init__.py rename to test/unittests/configuration/__init__.py diff --git a/test/configuration/mycroft.conf b/test/unittests/configuration/mycroft.conf similarity index 100% rename from test/configuration/mycroft.conf rename to test/unittests/configuration/mycroft.conf diff --git a/test/main.py b/test/unittests/main.py similarity index 100% rename from test/main.py rename to test/unittests/main.py diff --git a/test/mycroft.conf b/test/unittests/mycroft.conf similarity index 100% rename from test/mycroft.conf rename to test/unittests/mycroft.conf diff --git a/test/regex_test/invalid/invalid.rx b/test/unittests/regex_test/invalid/invalid.rx similarity index 100% rename from test/regex_test/invalid/invalid.rx rename to test/unittests/regex_test/invalid/invalid.rx diff --git a/test/skills/empty_dir/.git_keep b/test/unittests/regex_test/invalid/none.rx similarity index 100% rename from test/skills/empty_dir/.git_keep rename to test/unittests/regex_test/invalid/none.rx diff --git a/test/regex_test/valid/multiple.rx b/test/unittests/regex_test/valid/multiple.rx similarity index 100% rename from test/regex_test/valid/multiple.rx rename to test/unittests/regex_test/valid/multiple.rx diff --git a/test/regex_test/valid/single.rx b/test/unittests/regex_test/valid/single.rx similarity index 100% rename from test/regex_test/valid/single.rx rename to test/unittests/regex_test/valid/single.rx diff --git a/test/skills/__init__.py b/test/unittests/skills/__init__.py similarity index 100% rename from test/skills/__init__.py rename to test/unittests/skills/__init__.py diff --git a/test/skills/core.py b/test/unittests/skills/core.py similarity index 100% rename from test/skills/core.py rename to test/unittests/skills/core.py diff --git a/test/vocab_test/none.voc b/test/unittests/skills/empty_dir/.git_keep similarity index 100% rename from test/vocab_test/none.voc rename to test/unittests/skills/empty_dir/.git_keep diff --git a/test/skills/scheduled_skills.py b/test/unittests/skills/scheduled_skills.py similarity index 100% rename from test/skills/scheduled_skills.py rename to test/unittests/skills/scheduled_skills.py diff --git a/test/skills/settings.py b/test/unittests/skills/settings.py similarity index 100% rename from test/skills/settings.py rename to test/unittests/skills/settings.py diff --git a/test/unittest.cfg b/test/unittests/unittest.cfg similarity index 100% rename from test/unittest.cfg rename to test/unittests/unittest.cfg diff --git a/test/unittests/util/__init__.py b/test/unittests/util/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/util/commented.json b/test/unittests/util/commented.json similarity index 100% rename from test/util/commented.json rename to test/unittests/util/commented.json diff --git a/test/util/plain.json b/test/unittests/util/plain.json similarity index 100% rename from test/util/plain.json rename to test/unittests/util/plain.json diff --git a/test/util/test_format.py b/test/unittests/util/test_format.py similarity index 100% rename from test/util/test_format.py rename to test/unittests/util/test_format.py diff --git a/test/util/test_json_helper.py b/test/unittests/util/test_json_helper.py similarity index 100% rename from test/util/test_json_helper.py rename to test/unittests/util/test_json_helper.py diff --git a/test/util/test_parse.py b/test/unittests/util/test_parse.py similarity index 100% rename from test/util/test_parse.py rename to test/unittests/util/test_parse.py diff --git a/test/util/test_signal.py b/test/unittests/util/test_signal.py similarity index 100% rename from test/util/test_signal.py rename to test/unittests/util/test_signal.py diff --git a/test/unittests/vocab_test/none.voc b/test/unittests/vocab_test/none.voc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/vocab_test/test.voc b/test/unittests/vocab_test/test.voc similarity index 100% rename from test/vocab_test/test.voc rename to test/unittests/vocab_test/test.voc diff --git a/test/vocab_test/valid/multiple.voc b/test/unittests/vocab_test/valid/multiple.voc similarity index 100% rename from test/vocab_test/valid/multiple.voc rename to test/unittests/vocab_test/valid/multiple.voc diff --git a/test/vocab_test/valid/multiplealias.voc b/test/unittests/vocab_test/valid/multiplealias.voc similarity index 100% rename from test/vocab_test/valid/multiplealias.voc rename to test/unittests/vocab_test/valid/multiplealias.voc diff --git a/test/vocab_test/valid/single.voc b/test/unittests/vocab_test/valid/single.voc similarity index 100% rename from test/vocab_test/valid/single.voc rename to test/unittests/vocab_test/valid/single.voc diff --git a/test/vocab_test/valid/singlealias.voc b/test/unittests/vocab_test/valid/singlealias.voc similarity index 100% rename from test/vocab_test/valid/singlealias.voc rename to test/unittests/vocab_test/valid/singlealias.voc