summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/mobile/b2gautomation.py4
-rw-r--r--build/mobile/remoteautomation.py4
-rw-r--r--build/release/info.py2
-rw-r--r--build/variables.py2
4 files changed, 6 insertions, 6 deletions
diff --git a/build/mobile/b2gautomation.py b/build/mobile/b2gautomation.py
index d49a5f1ac..d73edd419 100644
--- a/build/mobile/b2gautomation.py
+++ b/build/mobile/b2gautomation.py
@@ -241,8 +241,8 @@ class B2GRemoteAutomation(Automation):
self._devicemanager.killProcess('/system/b2g/b2g', sig=signal.SIGABRT)
timeout = 10 # seconds
- starttime = datetime.datetime.now()
- while datetime.datetime.now() - starttime < datetime.timedelta(seconds=timeout):
+ starttime = datetime.datetime.utcnow()
+ while datetime.datetime.utcnow() - starttime < datetime.timedelta(seconds=timeout):
if not self._devicemanager.processExist('/system/b2g/b2g'):
break
time.sleep(1)
diff --git a/build/mobile/remoteautomation.py b/build/mobile/remoteautomation.py
index 7b2fad6cb..1358e0dfe 100644
--- a/build/mobile/remoteautomation.py
+++ b/build/mobile/remoteautomation.py
@@ -387,9 +387,9 @@ class RemoteAutomation(Automation):
# Get log updates on each interval, but if it is taking
# too long, only do it every 60 seconds
if (not slowLog) or (timer % 60 == 0):
- startRead = datetime.datetime.now()
+ startRead = datetime.datetime.utcnow()
hasOutput = self.read_stdout()
- if (datetime.datetime.now() - startRead) > datetime.timedelta(seconds=5):
+ if (datetime.datetime.utcnow() - startRead) > datetime.timedelta(seconds=5):
slowLog = True
if hasOutput:
noOutputTimer = 0
diff --git a/build/release/info.py b/build/release/info.py
index 9f42edd5a..7e7a30bce 100644
--- a/build/release/info.py
+++ b/build/release/info.py
@@ -129,7 +129,7 @@ def getReleaseTag(tag):
def generateRelbranchName(version, prefix='GECKO'):
return '%s%s_%s_RELBRANCH' % (
prefix, version.replace('.', ''),
- datetime.now().strftime('%Y%m%d%H'))
+ datetime.utcnow().strftime('%Y%m%d%H'))
def getReleaseName(product, version, buildNumber):
diff --git a/build/variables.py b/build/variables.py
index 7761e6096..de0903af2 100644
--- a/build/variables.py
+++ b/build/variables.py
@@ -17,7 +17,7 @@ def buildid_header(output):
print('Ignoring invalid MOZ_BUILD_DATE: %s' % buildid, file=sys.stderr)
buildid = None
if not buildid:
- buildid = datetime.now().strftime('%Y%m%d%H%M%S')
+ buildid = datetime.utcnow().strftime('%Y%m%d%H%M%S')
output.write("#define MOZ_BUILDID %s\n" % buildid)