Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/__init__.py (240356 => 240357)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/__init__.py 2019-01-23 21:28:35 UTC (rev 240356)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/__init__.py 2019-01-23 21:37:30 UTC (rev 240357)
@@ -1,4 +1,4 @@
from buildermappings import *
-from builds import *
+from build import *
from patch import *
from steps import *
Copied: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py (from rev 240356, trunk/Tools/BuildSlaveSupport/ews-app/ews/models/builds.py) (0 => 240357)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py (rev 0)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-01-23 21:37:30 UTC (rev 240357)
@@ -0,0 +1,42 @@
+# Copyright (C) 2018 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from __future__ import unicode_literals
+
+from django.db import models
+from ews.models.patch import Patch
+
+
+class Build(models.Model):
+ patch = models.ForeignKey(Patch, _on_delete_=models.CASCADE)
+ buildid = models.IntegerField(primary_key=True)
+ builderid = models.IntegerField()
+ number = models.IntegerField()
+ result = models.IntegerField()
+ state_string = models.TextField()
+ started_at = models.IntegerField()
+ complete_at = models.IntegerField()
+ created = models.DateTimeField(auto_now_add=True)
+ modified = models.DateTimeField(auto_now=True)
+
+ def __str__(self):
+ return str(self.buildid)
Deleted: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/builds.py (240356 => 240357)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/builds.py 2019-01-23 21:28:35 UTC (rev 240356)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/builds.py 2019-01-23 21:37:30 UTC (rev 240357)
@@ -1,42 +0,0 @@
-# Copyright (C) 2018 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from __future__ import unicode_literals
-
-from django.db import models
-from ews.models.patch import Patch
-
-
-class Builds(models.Model):
- patch = models.ForeignKey(Patch, _on_delete_=models.CASCADE)
- buildid = models.IntegerField(primary_key=True)
- builderid = models.IntegerField()
- number = models.IntegerField()
- result = models.IntegerField()
- state_string = models.TextField()
- started_at = models.IntegerField()
- complete_at = models.IntegerField()
- created = models.DateTimeField(auto_now_add=True)
- modified = models.DateTimeField(auto_now=True)
-
- def __str__(self):
- return str(self.buildid)
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/steps.py (240356 => 240357)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/steps.py 2019-01-23 21:28:35 UTC (rev 240356)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/steps.py 2019-01-23 21:37:30 UTC (rev 240357)
@@ -23,12 +23,12 @@
from __future__ import unicode_literals
from django.db import models
-from ews.models.builds import Builds
+from ews.models.build import Build
class Steps(models.Model):
stepid = models.IntegerField(primary_key=True)
- build = models.ForeignKey(Builds, _on_delete_=models.CASCADE)
+ build = models.ForeignKey(Build, _on_delete_=models.CASCADE)
result = models.IntegerField()
state_string = models.TextField()
started_at = models.IntegerField()
Modified: trunk/Tools/ChangeLog (240356 => 240357)
--- trunk/Tools/ChangeLog 2019-01-23 21:28:35 UTC (rev 240356)
+++ trunk/Tools/ChangeLog 2019-01-23 21:37:30 UTC (rev 240357)
@@ -1,3 +1,13 @@
+2019-01-23 Aakash Jain <aakash_j...@apple.com>
+
+ [ews-app] Rename ews model Builds to Build
+ https://bugs.webkit.org/show_bug.cgi?id=193695
+
+ Reviewed by Lucas Forschler.
+
+ * BuildSlaveSupport/ews-app/ews/models/build.py: Renamed from Tools/BuildSlaveSupport/ews-app/ews/models/builds.py.
+ (Build): Renamed Builds to Build.
+
2019-01-23 Jonathan Bedard <jbed...@apple.com>
webkitpy: Wait longer when launching WebKitTestRunner
