fix issue with attached panes on unit tests

Author: tony

tmuxp/server.py

@@ -237,17 +237,12 @@ def _list_panes(self):
             dict((k, v) for k, v in window.items() if v) for window in panes
         ]
 
-        # tmux < 1.8 doesn't have window_id, use window_name
-        for p in panes:
-            if not 'window_id' in p:
-                p['window_id'] = p['window_name']
-
-
         if self._panes:
             # http://stackoverflow.com/a/14465359
             self._panes[:] = []
 
         self._panes.extend(panes)
+        logger.error([p.get('session_id') for p in self._panes])
 
         return self._panes
 

tmuxp/session.py

@@ -175,7 +175,13 @@ def kill_window(self, target_window=None):
         self.server._update_windows()
 
     def _list_windows(self):
-        return self.server._update_windows()._windows
+        windows = self.server._update_windows()._windows
+
+        windows = [
+            w for w in windows if w['session_id'] == self.get('session_id')
+        ]
+
+        return windows
 
     @property
     def _windows(self):

tmuxp/testsuite/helpers.py

@@ -27,19 +27,15 @@ def bootstrap():
 
     '''
 
-    # session_list = t.sessions
-
-    # assert session_list == t.sessions
-
     # find current sessions prefixed with tmuxp
-    # old_test_sessions = [s.get('session_name') for s in session_list
-                        # if
-                        # s.get('session_name').startswith(TEST_SESSION_PREFIX)]
+    old_test_sessions = [s.get('session_name') for s in t._sessions
+                        if
+                        s.get('session_name').startswith(TEST_SESSION_PREFIX)]
 
-    # other_sessions = [s.get('session_name') for s in session_list
-                      # if not s.get('session_name').startswith(
-                          # TEST_SESSION_PREFIX
-                      # )]
+    other_sessions = [s.get('session_name') for s in t._sessions
+                      if not s.get('session_name').startswith(
+                          TEST_SESSION_PREFIX
+                      )]
 
     # assert session_list == t.sessions
 
@@ -59,11 +55,12 @@ def bootstrap():
         # t.attach_session(session.get('session_id'))
         pass
 
-    # for old_test_session in old_test_sessions:
-        # logger.debug('Old test test session %s found. Killing it.' %
-                      # old_test_session)
-        # t.kill_session(old_test_session)
+    for old_test_session in old_test_sessions:
+        logger.debug('Old test test session %s found. Killing it.' %
+                      old_test_session)
+        t.kill_session(old_test_session)
     assert TEST_SESSION_NAME == session.get('session_name')
+    assert TEST_SESSION_NAME != 'tmuxp'
 
     return (TEST_SESSION_NAME, session)
 
@@ -83,7 +80,7 @@ def setup(self):
     @classmethod
     def setUpClass(cls):
         try:
-            t.tmux('kill-server')
+            #t.tmux('kill-server')
 
             cls.TEST_SESSION_NAME, cls.session = bootstrap()
         # except TmuxNoClientsRunning:
@@ -99,5 +96,5 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        t.tmux('kill-server')
+        #t.tmux('kill-server')
         pass

tmuxp/testsuite/test_window.py

@@ -45,13 +45,30 @@ class NewTest(TmuxTestCase):
 
     def test_zfresh_window_data(self):
         # self.session.select_window(1)
+        #
+        logger.error(self.session.attached_window())
+        logger.error(self.session.attached_window().get('window_name'))
+        logger.error(self.session.windows)
+        logger.error(self.session.attached_window().panes)
+        self.assertEqual(len(self.session.windows), 1)
+
+        self.assertEqual(len(self.session.attached_window().panes), 1)
         current_windows = len(self.session._windows)
+        self.assertNotEqual('@0', self.session.get('session_id'))
+        self.assertEqual(current_windows, 1)
+
+        self.assertEqual(len(self.session.attached_window().panes), 1)
         self.assertIsInstance(self.session.server, Server)
         # len(self.session.attached_window().panes))
+
+        self.assertEqual(1, len(self.session.windows))
+        self.assertEqual(len(self.session.attached_window().panes), 1)
         for w in self.session.windows:
             self.assertIsInstance(w, Window)
         window = self.session.attached_window()
         self.assertIsInstance(window, Window)
+        logger.error(t.sessions)
+        self.assertEqual(len(self.session.attached_window().panes), 1)
         pane = window.split_window()
         self.session.attached_window().select_pane(0)
         self.session.attached_pane().send_keys('cd /srv/www/flaskr')

tmuxp/window.py

@@ -36,14 +36,9 @@ def __init__(self, session=None, **kwargs):
         self.server = self.session.server
 
         if not 'window_id' in kwargs:
-            if kwargs['window_index']:
-                self._window_id = kwargs['window_index']
-            else:
-                raise ValueError('Window requires a `window_id`')
+            raise ValueError('Window requires a `window_id`')
 
-        if not 'window_index' in kwargs:
-            raise ValueError('Window requires a `window_index`')
-        self._window_index = kwargs['window_index']
+        self._window_id = kwargs['window_id']
 
         #self.server._update_windows()
 
@@ -60,7 +55,7 @@ def __repr__(self):
     def _TMUX(self, *args):
 
         attrs = {
-            'window_index': self._window_index
+            'window_id': self._window_id
         }
 
         # from https://github.com/serkanyersen/underscore.py
@@ -285,6 +280,8 @@ def split_window(self, attach=True):
 
         #'-t%s' % self.attached_pane().get('pane_id'),
         # 2013-10-18 LOOK AT THIS, rm'd it..
+        logger.error(self.get('session_id'))
+        logger.error(self.panes)
 
         tmux_args = (
             '-t%s' % self.panes[0].get('pane_id'),
@@ -301,33 +298,11 @@ def split_window(self, attach=True):
 
         # tmux < 1.7. This is added in 1.7.
         if pane.stderr:
-            if 'unknown option -- F' in pane.stderr[0]:
-                tmux_args = (
-                    '-t%s' % self.panes[0].get('pane_id'),
-                )
-                if not attach:
-                    tmux_args += ('-d',)
-                proc = self.tmux(
-                    'split-window',
-                    '-P',
-                    *tmux_args
-                )
-                if proc.stderr:
-                    raise Exception(pane.stderr)
-
-                pane = proc.stdout[0]
-                import re
-                pane_regex = re.compile(r"^(?P<session_name>.*):(?P<window_index>\d*?).(?P<pane_index>\d*?)$")
-                m = re.match(pane_regex, pane)
-                pane = m.groupdict()
-
-                pane['pane_id'] = pane['pane_index']
-
-                #pane = dict(zip(['session_name', 'window_index'], pane[0].split(':')))
-
-                # todo, this needs code to find the newest pane created
-            else:
-                raise Exception(pane.stderr)
+            raise Exception(pane.stderr)
+            if 'pane too small' in pane.stderr:
+                pass
+
+            raise Exception(pane.stderr, self._TMUX, self.panes)
         else:
             pane = pane.stdout[0]
 
@@ -357,11 +332,13 @@ def _list_panes(self):
         panes = self.server._update_panes()._panes
 
         panes = [
-            p for p in panes if p['session_name'] == self.get('session_name')
+            p for p in panes if p['session_id'] == self.get('session_id')
         ]
+        logger.error(self.get('session_id'))
         panes = [
             p for p in panes if p['window_id'] == self.get('window_id')
         ]
+        logger.error(self.get('window_id'))
         return panes
 
     @property