diff --git a/source/easymacro.py b/source/easymacro.py index ef7af45..d91c6af 100644 --- a/source/easymacro.py +++ b/source/easymacro.py @@ -124,6 +124,7 @@ log = logging.getLogger(__name__) # ~ You can get custom salt # ~ codecs.encode(os.urandom(16), 'hex') +# ~ but, not modify this file, modify in import file SALT = b'c9548699d4e432dfd2b46adddafbb06d' TIMEOUT = 10 diff --git a/source/test_easymacro.py b/source/test_easymacro.py index 08716e5..ffcca99 100644 --- a/source/test_easymacro.py +++ b/source/test_easymacro.py @@ -2,7 +2,7 @@ # coding: utf-8 import unittest -import easymacro2 as app +import easymacro as app class BaseTest(unittest.TestCase): @@ -69,26 +69,6 @@ class BaseTest(unittest.TestCase): class TestVars(BaseTest): - def test_name(self): - expected = 'LibreOffice' - result = app.NAME - self.assertEqual(result, expected) - - def test_version(self): - expected = '7.0' - result = app.VERSION - self.assertEqual(result, expected) - - def test_lang(self): - expected = 'en' - result = app.LANG - self.assertEqual(result, expected) - - def test_language(self): - expected = 'en-US' - result = app.LANGUAGE - self.assertEqual(result, expected) - def test_os(self): expected = 'Linux' result = app.OS @@ -98,6 +78,10 @@ class TestVars(BaseTest): result = app.IS_WIN self.assertFalse(result) + def test_is_mac(self): + result = app.IS_MAC + self.assertFalse(result) + def test_user(self): expected = 'mau' result = app.USER @@ -113,6 +97,26 @@ class TestVars(BaseTest): result = app.DESKTOP self.assertEqual(result, expected) + def test_language(self): + expected = 'en-US' + result = app.LANGUAGE + self.assertEqual(result, expected) + + def test_lang(self): + expected = 'en' + result = app.LANG + self.assertEqual(result, expected) + + def test_name(self): + expected = 'LibreOffice' + result = app.NAME + self.assertEqual(result, expected) + + def test_version(self): + expected = '7.0' + result = app.VERSION + self.assertEqual(result, expected) + if __name__ == '__main__': unittest.main()