Updated fix for TZ issue

README_TEST.md

@@ -2,10 +2,11 @@
 1) To run the test framework, first install pytest: ```pip install pytest```
 2) You can run the test two ways:
    1) Run command `python -m pytest`
-   2) Locate and run the file `test/test_getters.py` 
-
-Note: The test "test_get_interfaces" passes for CI/CD on Github, but it does not pass on individual local system due to 
-computational difference on different Operating Systems of date and time.
+   2) Locate and run the file `test/test_getters.py`
 
+In order to run the tests using Docker and the minimal supported Python version:
+```
+docker run -it --rm --name run-test -v "$PWD":/usr/src/myapp -w /usr/src/myapp python:3.6 test/run_test.sh
+```   
 
 We welcome suggestions and contributions of additional tests for the framework. Please contact the Nokia owners of this repository for how to contribute.

napalm_sros/sros.py

@@ -31,6 +31,9 @@
 from dictdiffer import diff
 import paramiko
 
+# Fix an issue with timezone processing in Python 3.6
+from dateutil.parser import parse as dateutil_parse
+
 # import NAPALM libraries
 
 from lxml import etree
@@ -784,13 +787,12 @@ def get_interfaces(self):
                     if_state, "state_ns:last-oper-change", namespaces=self.nsmap
                 )
                 ifd["last_flapped"] = (
-                    datetime.datetime.strptime(
-                        flap_time, "%Y-%m-%dT%H:%M:%S.%fZ"
-                    ).timestamp()
-                    if flap_time != ""
-                    else -1.0
+                    # This has an issue with the timezone, fixed in Python 3.7
+                    #datetime.datetime.strptime(
+                    #    flap_time, "%Y-%m-%dT%H:%M:%S.%fZ"
+                    #).timestamp()
+                    dateutil_parse(flap_time).timestamp() if flap_time != "" else -1.0
                 )
-
                 ifd["mtu"] = convert(
                     int,
                     self._find_txt(if_state, "state_ns:oper-ip-mtu", namespaces=self.nsmap),
@@ -4221,4 +4223,3 @@ def cli(self, commands):
         except Exception as e:
             print("Error in method cli : {}".format(e))
             log.error("Error in method cli : %s" % traceback.format_exc())
-

requirements.txt

@@ -8,4 +8,5 @@ lxml>=4.6.4
 ncclient>=0.6.7
 xmltodict>=0.12.0
 dictdiffer>=0.9.0
-datetime>=4.3
+datetime>=4.3
+python-dateutil>=2.8.1

test/run_test.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+pip install -r requirements.txt -r requirements-dev.txt
+python -m pytest

test/unit/conftest.py

@@ -1,7 +1,6 @@
 """Test fixtures."""
 
 import pytest
-import os
 from lxml import etree
 
 from napalm.base.test import conftest as parent_conftest
@@ -10,11 +9,6 @@
 
 from napalm_sros import sros
 
-@pytest.fixture(scope="session", autouse=True)
-def setenv():
-    # Set timezone such that mock link_flap timestamps are generated correctly
-    os.environ["TZ"] = "GMT"
-
 @pytest.fixture(scope="class")
 def set_device_parameters(request):
     """Set up the class."""