From c913a023add0a42f1ae004943571e7e34ddac30f Mon Sep 17 00:00:00 2001 From: Matthew Leonberger Date: Sun, 24 Sep 2017 16:28:52 +0900 Subject: Remove sequence order tests per Issue #102 --- tests/test_sequences.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'tests') diff --git a/tests/test_sequences.py b/tests/test_sequences.py index 8034da7..72f16b7 100755 --- a/tests/test_sequences.py +++ b/tests/test_sequences.py @@ -34,13 +34,5 @@ class Testsequences(unittest.TestCase): result = sequences.set_iterm_tab_color(COLORS["special"]["background"]) self.assertEqual(len(result), 104) - def test_sequence_order(self): - """> Test that the sequences are in order.""" - result = sequences.create_sequences(COLORS, vte=False).split("\007") - self.assertEqual(result[2], "\x1b]4;2;#CC6A93") - self.assertEqual(result[15], "\x1b]4;15;#F5F1F4") - self.assertEqual(result[8], "\x1b]4;8;#666666") - - if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From a56019761246857ede1a0e702324ad0274ff001f Mon Sep 17 00:00:00 2001 From: Matthew Leonberger Date: Sun, 24 Sep 2017 16:48:02 +0900 Subject: Add OS detection for mac specific tests Merge branch 'macos_test' of https://github.com/linuxunil/pywal into macos_test Revert "pylint and flake8 need to be in before_install" This reverts commit b2320013e737ed9048b3946cdfee4f2ee113d62d. --- tests/test_sequences.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/test_sequences.py b/tests/test_sequences.py index 72f16b7..6488298 100755 --- a/tests/test_sequences.py +++ b/tests/test_sequences.py @@ -1,5 +1,6 @@ """Test sequence functions.""" import unittest +import platform from pywal import sequences from pywal import util @@ -16,23 +17,33 @@ class Testsequences(unittest.TestCase): """> Create special escape sequence.""" util.Color.alpha_num = 100 result = sequences.set_special(11, COLORS["special"]["background"]) - self.assertEqual(result, "\033]11;#1F211E\007") + if platform.uname()[0] == "Darwin": + self.assertEqual(result, "\033]Ph1F211E\033\\") + else: + self.assertEqual(result, "\033]11;#1F211E\007") def test_set_special_alpha(self): """> Create special escape sequence with alpha.""" util.Color.alpha_num = 99 result = sequences.set_special(11, COLORS["special"]["background"]) - self.assertEqual(result, "\033]11;[99]#1F211E\007") + if platform.uname()[0] == "Darwin": + self.assertEqual(result, "\033]Ph1F211E\033\\") + else: + self.assertEqual(result, "\033]11;[99]#1F211E\007") def test_set_color(self): """> Create color escape sequence.""" result = sequences.set_color(11, COLORS["colors"]["color0"]) - self.assertEqual(result, "\033]4;11;#1F211E\007") + if platform.uname()[0] == "Darwin": + self.assertEqual(result, "\033]Pb1F211E\033\\") + else: + self.assertEqual(result, "\033]4;11;#1F211E\007") def test_set_iterm_tab_color(self): """> Create iterm tab color sequences""" result = sequences.set_iterm_tab_color(COLORS["special"]["background"]) self.assertEqual(len(result), 104) + if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From 91e48e19bca3cf46f6e403a320638246b3d1b215 Mon Sep 17 00:00:00 2001 From: Matthew Leonberger Date: Tue, 26 Sep 2017 08:58:44 +0900 Subject: Fix MacOS Unittests Tests now check which OS we are on and use the appropriate escapes Merge remote-tracking branch 'origin/hotfix/unittests' into hotfix/unittests --- tests/test_sequences.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_sequences.py b/tests/test_sequences.py index 6488298..2a993f5 100755 --- a/tests/test_sequences.py +++ b/tests/test_sequences.py @@ -5,7 +5,6 @@ import platform from pywal import sequences from pywal import util - # Import colors. COLORS = util.read_file_json("tests/test_files/test_file.json") @@ -17,6 +16,7 @@ class Testsequences(unittest.TestCase): """> Create special escape sequence.""" util.Color.alpha_num = 100 result = sequences.set_special(11, COLORS["special"]["background"]) + if platform.uname()[0] == "Darwin": self.assertEqual(result, "\033]Ph1F211E\033\\") else: @@ -26,6 +26,7 @@ class Testsequences(unittest.TestCase): """> Create special escape sequence with alpha.""" util.Color.alpha_num = 99 result = sequences.set_special(11, COLORS["special"]["background"]) + if platform.uname()[0] == "Darwin": self.assertEqual(result, "\033]Ph1F211E\033\\") else: @@ -34,6 +35,7 @@ class Testsequences(unittest.TestCase): def test_set_color(self): """> Create color escape sequence.""" result = sequences.set_color(11, COLORS["colors"]["color0"]) + if platform.uname()[0] == "Darwin": self.assertEqual(result, "\033]Pb1F211E\033\\") else: -- cgit v1.2.3