<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175798] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175798">175798</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-09 22:11:47 -0800 (Sun, 09 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>make-passwords-json.py should generarate everything needed for testing
https://bugs.webkit.org/show_bug.cgi?id=138503
Reviewed by Ryosuke Niwa.
* BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py:
Renamed from make-passwords-json.py to be able included from mastercfg_unittest.py.
Additionally generate auth.json, credentials.cfg and committers.cfg too.
(create_mock_slave_passwords_dict): Moved from mastercfg_unittest.py
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
(BuildBotConfigLoader._mock_open): Use make_passwords_json.create_mock_slave_passwords_dict() to avoid duplication.
(BuildBotConfigLoader._create_mock_passwords_dict): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmake_passwords_jsonpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmakepasswordsjsonpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make-passwords-json.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmakepasswordsjsonpy"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make-passwords-json.py (175797 => 175798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make-passwords-json.py 2014-11-10 05:48:35 UTC (rev 175797)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make-passwords-json.py 2014-11-10 06:11:47 UTC (rev 175798)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-#!/usr/bin/python
-
-import json
-
-with open('config.json', 'r') as config_file:
- config = json.load(config_file)
- passwords = {}
- for slave in config['slaves']:
- passwords[slave['name']] = 'a'
-
-with open('passwords.json', 'w') as passwords_file:
- passwords_file.write(json.dumps(passwords))
</del></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmake_passwords_jsonpy"></a>
<div class="addfile"><h4>Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py (0 => 175798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py (rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py 2014-11-10 06:11:47 UTC (rev 175798)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+#!/usr/bin/env python
+
+# Copyright (C) 2011 Apple Inc. All rights reserved.
+# Copyright (C) 2014 University of Szeged. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+# OWNER OR 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.
+
+import json
+import md5
+
+
+def create_mock_slave_passwords_dict():
+ with open('config.json', 'r') as config_json:
+ config_dict = json.load(config_json)
+ return dict([(slave['name'], '1234') for slave in config_dict['slaves']])
+
+if __name__ == '__main__':
+ with open('passwords.json', 'w') as passwords_file:
+ passwords_file.write(json.dumps(create_mock_slave_passwords_dict(), indent=4, sort_keys=True))
+
+ with open('auth.json', 'w') as auth_json_file:
+ auth_json_file.write("""{
+ "trac_credentials": "credentials.cfg",
+ "webkit_committers": "committers.cfg"
+}""")
+
+ with open('credentials.cfg', 'w') as credentials_file:
+ credentials_file.write("committer@webkit.org:Mac OS Forge:%s" % md5.new("committer@webkit.org:Mac OS Forge:committerpassword").hexdigest())
+
+ with open('committers.cfg', 'w') as committers_file:
+ committers_file.write("""[groups]
+webkit = committer@webkit.org
+""")
</ins><span class="cx">Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (175797 => 175798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-11-10 05:48:35 UTC (rev 175797)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-11-10 06:11:47 UTC (rev 175798)
</span><span class="lines">@@ -4,6 +4,8 @@
</span><span class="cx"> import os
</span><span class="cx"> import StringIO
</span><span class="cx"> import unittest
</span><ins>+import make_passwords_json
+import json
</ins><span class="cx">
</span><span class="cx"> # Show DepricationWarnings come from buildbot - it isn't default with Python 2.7 or newer.
</span><span class="cx"> # See https://bugs.webkit.org/show_bug.cgi?id=90161 for details.
</span><span class="lines">@@ -20,13 +22,9 @@
</span><span class="cx"> scripts_dir = os.path.join(webkit_tools_dir, 'Scripts')
</span><span class="cx"> sys.path.append(scripts_dir)
</span><span class="cx">
</span><del>- def _create_mock_passwords_dict(self):
- config_dict = json.load(open('config.json'))
- return dict([(slave['name'], '1234') for slave in config_dict['slaves']])
-
</del><span class="cx"> def _mock_open(self, filename):
</span><span class="cx"> if filename == 'passwords.json':
</span><del>- return StringIO.StringIO(json.dumps(self._create_mock_passwords_dict()))
</del><ins>+ return StringIO.StringIO(json.dumps(make_passwords_json.create_mock_slave_passwords_dict()))
</ins><span class="cx"> return __builtins__.open(filename)
</span><span class="cx">
</span><span class="cx"> def _add_dependant_modules_to_sys_modules(self):
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (175797 => 175798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-11-10 05:48:35 UTC (rev 175797)
+++ trunk/Tools/ChangeLog 2014-11-10 06:11:47 UTC (rev 175798)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-11-09 Csaba Osztrogonác <ossy@webkit.org>
+
+ make-passwords-json.py should generarate everything needed for testing
+ https://bugs.webkit.org/show_bug.cgi?id=138503
+
+ Reviewed by Ryosuke Niwa.
+
+ * BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py:
+ Renamed from make-passwords-json.py to be able included from mastercfg_unittest.py.
+ Additionally generate auth.json, credentials.cfg and committers.cfg too.
+ (create_mock_slave_passwords_dict): Moved from mastercfg_unittest.py
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ (BuildBotConfigLoader._mock_open): Use make_passwords_json.create_mock_slave_passwords_dict() to avoid duplication.
+ (BuildBotConfigLoader._create_mock_passwords_dict): Deleted.
+
</ins><span class="cx"> 2014-11-09 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] generate-gtkdoc should ignore invalid files
</span></span></pre>
</div>
</div>
</body>
</html>