Another stab at fixing command options in tmux versions

Author: tony

tests/test_session.py

@@ -7,7 +7,7 @@
 import pytest
 
 from libtmux import Pane, Session, Window, exc
-from libtmux.common import has_gte_version
+from libtmux.common import has_gte_version, has_lt_version
 from libtmux.test import TEST_SESSION_PREFIX, namer
 
 logger = logging.getLogger(__name__)
@@ -132,9 +132,12 @@ def test_empty_session_option_returns_None(session):
 
 def test_show_option_unknown(session):
     """Session.show_option raises UnknownOption for invalid option."""
-    with pytest.raises(
-        exc.InvalidOption if has_gte_version('3.0') else exc.AmbiguousOption
-    ):
+    cmd_exception = exc.AmbiguousOption
+    if has_gte_version('2.8') and has_lt_version('3.0'):
+        cmd_exception = exc.UnknownOption
+    elif has_gte_version('3.0'):
+        cmd_exception = exc.InvalidOption
+    with pytest.raises(cmd_exception):
         session.show_option('moooz')
 
 

tests/test_window.py

@@ -7,7 +7,7 @@
 import pytest
 
 from libtmux import Pane, Server, Window, exc
-from libtmux.common import has_gte_version
+from libtmux.common import has_gte_version, has_lt_version
 
 logger = logging.getLogger(__name__)
 
@@ -213,9 +213,12 @@ def test_show_window_option_unknown(session):
     """Window.show_window_option raises UnknownOption for bad option key."""
     window = session.new_window(window_name='test_window')
 
-    with pytest.raises(
-        exc.InvalidOption if has_gte_version('3.0') else exc.AmbiguousOption
-    ):
+    cmd_exception = exc.AmbiguousOption
+    if has_gte_version('2.8') and has_lt_version('3.0'):
+        cmd_exception = exc.UnknownOption
+    elif has_gte_version('3.0'):
+        cmd_exception = exc.InvalidOption
+    with pytest.raises(cmd_exception):
         window.show_window_option('moooz')