Merge pull request #106 from Galvant/bugfixes

Bugfixes for #104

instruments/abstract_instruments/comm/gi_gpib_communicator.py

@@ -48,7 +48,7 @@ def __init__(self, filelike, gpib_address):
         if self._version <= 4:
             self._eos = 10
         else:
-            self._eos = 2
+            self._eos = "\n"  # pylint: disable=redefined-variable-type
 
     # PROPERTIES #
 

instruments/abstract_instruments/instrument.py

@@ -264,16 +264,17 @@ def binblockread(self, data_width, fmt=None):
             default.
         """
         # This needs to be a # symbol for valid binary block
-        symbol = self._file.read(1)
-        if symbol != "#":  # Check to make sure block is valid
+        symbol = self._file.read_raw(1)
+        if symbol != b"#":  # Check to make sure block is valid
             raise IOError("Not a valid binary block start. Binary blocks "
-                          "require the first character to be #.")
+                          "require the first character to be #, instead got "
+                          "{}".format(symbol))
         else:
             # Read in the num of digits for next part
             digits = int(self._file.read_raw(1))
 
             # Read in the num of bytes to be read
-            num_of_bytes = int(self._file.read(digits))
+            num_of_bytes = int(self._file.read_raw(digits))
 
             # Make or use the required format string.
             if fmt is None:

instruments/tests/test_base_instrument.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Module containing tests for the base Instrument class
+"""
+
+# IMPORTS ####################################################################
+
+from __future__ import absolute_import
+
+from builtins import bytes
+
+# pylint: disable=unused-import
+from nose.tools import raises
+import quantities as pq
+
+import numpy as np
+
+import instruments as ik
+from instruments.tests import expected_protocol
+
+# TESTS ######################################################################
+
+
+def test_instrument_binblockread():
+    with expected_protocol(
+        ik.Instrument,
+        [],
+        [
+            b"#210" + bytes.fromhex("00000001000200030004") + b"0",
+        ],
+        sep="\n"
+    ) as inst:
+        np.testing.assert_array_equal(inst.binblockread(2), [0, 1, 2, 3, 4])

instruments/tests/test_comm/test_gi_gpibusb.py

@@ -29,6 +29,27 @@ def test_gpibusbcomm_init():
     assert isinstance(comm._file, SerialCommunicator)
 
 
+def test_gpibusbcomm_init_correct_values_new_firmware():
+    mock_gpib = mock.MagicMock()
+    mock_gpib.query.return_value = "5"
+    comm = GPIBCommunicator(mock_gpib, 1)
+
+    eq_(comm._terminator, "\n")
+    eq_(comm._version, 5)
+    eq_(comm._eos, "\n")
+    eq_(comm._eoi, True)
+    unit_eq(comm._timeout, 1000 * pq.millisecond)
+
+
+def test_gpibusbcomm_init_correct_values_old_firmware():
+    # This test just has the differences between the new and old firmware
+    mock_gpib = mock.MagicMock()
+    mock_gpib.query.return_value = "4"
+    comm = GPIBCommunicator(mock_gpib, 1)
+
+    eq_(comm._eos, 10)
+
+
 def test_gpibusbcomm_address():
     # Create our communicator
     comm = GPIBCommunicator(mock.MagicMock(), 1)