Merge pull request #26 from Sanji-IO/release/uc-8100-lx-cg_v1.1

Release/uc 8100 lx cg v1.1

build-deb/debian/changelog

@@ -1,3 +1,9 @@
+sanji-bundle-time (0.9.4-1) unstable; urgency=low
+
+  * Sync to RTC while using NTP.
+
+ -- Aeluin Chen <[email protected]>  Fri, 20 Nov 2015 13:50:48 +0800
+
 sanji-bundle-time (0.9.3-1) unstable; urgency=low
 
   * build-deb/ added for building Debian package.

bundle.json

@@ -1,6 +1,6 @@
 {
   "name": "time",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "author": "Zack YL Shih",
   "email": "[email protected]",
   "description": "System time management.",

systime/ntp.py

@@ -17,6 +17,13 @@ def NtpDate(server):
     rc = subprocess.call(["ntpdate", server])
     _logger.debug("NTP update %s." % "successfully"
                   if rc == 0 else "failed")
+    if rc != 0:
+        return rc
+
+    # Sync to RTC
+    rc = subprocess.call("hwclock -w", shell=True)
+    if rc == 0:
+        _logger.debug("Failed to sync to RTC")
 
     return rc
 

tests/test_systime/test_ntp.py

@@ -27,12 +27,12 @@ def test_NtpDate(self):
         with patch("systime.ntp.subprocess") as subprocess:
             subprocess.call.return_value = 0
             NtpDate(server)
-            subprocess.call.assert_called_once_with(["ntpdate", server])
+            subprocess.call.assert_any_call("hwclock -w", shell=True)
 
             subprocess.call.reset_mock()
             subprocess.call.return_value = 1
             NtpDate(server)
-            subprocess.call.assert_called_once_with(["ntpdate", server])
+            subprocess.call.assert_any_call(["ntpdate", server])
 
 
 class TestNtpClass(unittest.TestCase):