Merge pull request ua-parser#3 from commenthol/master

Ironholds · Ironholds · commit 6edfe377c7f0 · 2015-01-17T22:09:43.000-05:00
test_device_brandmodel.yaml merged into test_device.yaml
diff --git a/ua_parser/user_agent_parser_test.py b/ua_parser/user_agent_parser_test.py
@@ -53,10 +53,6 @@ def testStringsDevice(self):
         self.runDeviceTestsFromYAML(os.path.join(
             TEST_RESOURCES_DIR, 'tests/test_device.yaml'))
 
-    def testStringsDeviceBrandModel(self):
-        self.runDeviceTestsFromYAML(os.path.join(
-            TEST_RESOURCES_DIR, 'tests/test_device_brandmodel.yaml'))
-
     def testMozillaStrings(self):
         self.runUserAgentTestsFromYAML(os.path.join(
             TEST_RESOURCES_DIR, 'test_resources/firefox_user_agent_strings.yaml'))
diff --git a/uap-core b/uap-core
@@ -1 +1 @@
-Subproject commit 52335a8ebc40c4c273ebfa80abf950461d8d6707
+Subproject commit 22ef8a1eabf930b9756244595a782ac0f2ad1a00
