hash
stringlengths 40
40
| diff
stringlengths 131
26.7k
| message
stringlengths 7
694
| project
stringlengths 5
67
| split
stringclasses 1
value | diff_languages
stringlengths 2
24
|
|---|---|---|---|---|---|
906e3ac0c433c8efd97a08d1a57046fbdd3f0a0f
|
diff --git a/spec/adhearsion/punchblock/commands/output_spec.rb b/spec/adhearsion/punchblock/commands/output_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/adhearsion/punchblock/commands/output_spec.rb
+++ b/spec/adhearsion/punchblock/commands/output_spec.rb
@@ -185,6 +185,7 @@ module Adhearsion
describe "if an audio file cannot be found" do
before do
+ pending
mock_execution_environment.should_receive(:play_audio).with(args[0]).and_return(true).ordered
mock_execution_environment.should_receive(:play_audio).with(args[1]).and_return(false).ordered
mock_execution_environment.should_receive(:play_audio).with(args[2]).and_return(true).ordered
|
[CS] Fix a further failing test pending
|
adhearsion_adhearsion
|
train
|
rb
|
e7b9be98c1cfceda44737f5ba1bf6266f67b060b
|
diff --git a/lib/octokit/preview.rb b/lib/octokit/preview.rb
index <HASH>..<HASH> 100644
--- a/lib/octokit/preview.rb
+++ b/lib/octokit/preview.rb
@@ -16,7 +16,7 @@ module Octokit
:traffic => 'application/vnd.github.spiderman-preview'.freeze,
:org_membership => 'application/vnd.github.korra-preview'.freeze,
:reviews => 'application/vnd.github.black-cat-preview'.freeze,
- :integrations => 'Accept: application/vnd.github.machine-man-preview+json'.freeze
+ :integrations => 'application/vnd.github.machine-man-preview+json'.freeze
}
def ensure_api_media_type(type, options)
|
Fix incorrect mimetype for integrations in PREVIEW_TYPES
|
octokit_octokit.rb
|
train
|
rb
|
80b27fc3106ecf488388c7b07261d119988b5ca7
|
diff --git a/src/context/dependencies/verifyInstalledProjectDependencies.js b/src/context/dependencies/verifyInstalledProjectDependencies.js
index <HASH>..<HASH> 100644
--- a/src/context/dependencies/verifyInstalledProjectDependencies.js
+++ b/src/context/dependencies/verifyInstalledProjectDependencies.js
@@ -24,7 +24,7 @@ export default function verifyInstalledProjectDependencies({ dependencies, devDe
`You have some dependencies in your package.json that also have been exported by extensions. This is probably a mistake.
${underline('Roc will prioritize the ones exported by the extensions.')}
-You can override this by adding "¡" to the start of the require/import in the code, see documentation for more info.
+You can override this by adding "_" to the start of the require/import in the code, see documentation for more info.
Dependencies that is both exported and in the projects package.json:
${matches.map((match) => `- ${bold(match.name)} ${dim('from')} ` +
|
Corrected hint about how to opt-out from the Roc dependency management
|
rocjs_roc
|
train
|
js
|
6631f94643e49685e2b32a43100eb461bb315981
|
diff --git a/parsl/tests/test_ipp/bash_app.py b/parsl/tests/test_ipp/bash_app.py
index <HASH>..<HASH> 100644
--- a/parsl/tests/test_ipp/bash_app.py
+++ b/parsl/tests/test_ipp/bash_app.py
@@ -12,7 +12,7 @@ import argparse
# parsl.set_stream_logger()
workers = IPyParallelExecutor()
-dfk = DataFlowKernel(workers)
+dfk = DataFlowKernel(executors=[workers])
@App('bash', dfk)
|
Add missing keyword to DFK instantiation
Fixes #<I>.
|
Parsl_parsl
|
train
|
py
|
4343b9b58ef2ae43de442b8314ca2629cc64e860
|
diff --git a/src/vimpdb/proxy.py b/src/vimpdb/proxy.py
index <HASH>..<HASH> 100755
--- a/src/vimpdb/proxy.py
+++ b/src/vimpdb/proxy.py
@@ -37,6 +37,8 @@ class ProxyToVim(object):
return output.strip()
def _send(self, command):
+ # add ':<BS>' to hide last keys sent in VIM command-line
+ command = ''.join((command, ':<BS>'))
return_code = call([self.vim_client_script, '--servername',
self.server_name, '--remote-send', command])
if return_code:
|
less noise on VIM command-line
|
gotcha_vimpdb
|
train
|
py
|
8cce4aa35c79780ed1bf1753c6a22f7c93467648
|
diff --git a/worker.go b/worker.go
index <HASH>..<HASH> 100644
--- a/worker.go
+++ b/worker.go
@@ -392,10 +392,6 @@ func (tw *SpanWorker) Work() {
wg.Add(1)
go func(i int, sink sinks.SpanSink, span *ssf.SSFSpan, wg *sync.WaitGroup) {
start := time.Now()
- defer func() {
- atomic.AddInt64(&tw.cumulativeTimes[i],
- int64(time.Since(start)/time.Nanosecond))
- }()
// Give each sink a change to ingest.
err := sink.Ingest(span)
if err != nil {
@@ -407,6 +403,8 @@ func (tw *SpanWorker) Work() {
ssf.Count("worker.span.ingest_error_total", 1, tags))
}
}
+ atomic.AddInt64(&tw.cumulativeTimes[i],
+ int64(time.Since(start)/time.Nanosecond))
wg.Done()
}(i, s, m, &wg)
}
|
Don't defer counting the cumulative time spent in span processing
|
stripe_veneur
|
train
|
go
|
f9c8a6fd5ec7fa1255bbae732af6f3480fde00b4
|
diff --git a/treetime/treetime.py b/treetime/treetime.py
index <HASH>..<HASH> 100644
--- a/treetime/treetime.py
+++ b/treetime/treetime.py
@@ -476,6 +476,7 @@ class TreeTime(ClockTree):
#(Without outgroup_branch_length, gives a trifurcating root, but this will mean
#mutations may have to occur multiple times.)
self.tree.root_with_outgroup(new_root, outgroup_branch_length=new_root.branch_length/2)
+ self.tree.root.clades.sort(key = lambda x:x.count_terminals())
self.get_clock_model(covariation=use_cov, slope = slope)
|
sort clades by leaves after rooting
|
neherlab_treetime
|
train
|
py
|
20d998198bab755d0d878f904011deda2df00e08
|
diff --git a/output/Html.php b/output/Html.php
index <HASH>..<HASH> 100644
--- a/output/Html.php
+++ b/output/Html.php
@@ -121,23 +121,21 @@ abstract class QM_Output_Html extends QM_Output {
/**
* Returns the column sorter controls. Safe for output.
*
- * @TODO needs to be converted to use a button for semantics and a11y.
- *
* @param string $heading Heading text for the column. Optional.
* @return string Markup for the column sorter controls.
*/
protected function build_sorter( $heading = '' ) {
$out = '';
- $out .= '<div class="qm-th">';
+ $out .= '<label class="qm-th">';
$out .= '<span class="qm-sort-heading">';
if ( $heading ) {
$out .= esc_html( $heading );
}
$out .= '</span>';
- $out .= '<span class="qm-sort-controls">';
+ $out .= '<button class="qm-sort-controls">';
$out .= '<span class="dashicons qm-sort-arrow" aria-hidden="true"></span>';
- $out .= '</span>';
- $out .= '</div>';
+ $out .= '</button>';
+ $out .= '</label>';
return $out;
}
|
Switch to using labels and buttons for table sorting controls.
|
johnbillion_query-monitor
|
train
|
php
|
bf8a4ccffa43bbb56e8f5efb3b4a7807cd417041
|
diff --git a/lib/setup.php b/lib/setup.php
index <HASH>..<HASH> 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -406,12 +406,6 @@ global $SCRIPT;
$CFG->javascript = $CFG->libdir .'/javascript.php';
$CFG->moddata = 'moddata';
-// Alas, in some cases we cannot deal with magic_quotes.
- if (defined('MOODLE_SANE_INPUT') && ini_get_bool('magic_quotes_gpc')) {
- mdie("Facilities that require MOODLE_SANE_INPUT "
- . "cannot work with magic_quotes_gpc. Please disable "
- . "magic_quotes_gpc.");
- }
/// A hack to get around magic_quotes_gpc being turned on
/// It is strongly recommended to disable "magic_quotes_gpc"!
if (ini_get_bool('magic_quotes_gpc')) {
|
MDL-<I> removing magic_quotes test from setup.php when MOODLE_SANE_INPUT defined, scripts must find better way to inform admins, sorry
|
moodle_moodle
|
train
|
php
|
60cca760ceb005eb76feb5c799678fcd313f4657
|
diff --git a/tests/TestCase/Routing/RouterTest.php b/tests/TestCase/Routing/RouterTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/Routing/RouterTest.php
+++ b/tests/TestCase/Routing/RouterTest.php
@@ -333,6 +333,25 @@ class RouterTest extends TestCase {
}
/**
+ * Test that RouterCollection::routes() gets the list of connected routes.
+ *
+ * @return void
+ */
+ public function testRouteCollectionRoutes() {
+ $collection = new RouteCollection();
+ Router::setRouteCollection($collection);
+ Router::mapResources('Posts');
+
+ $routes = $collection->routes();
+
+ $this->assertEquals(count($routes), 6);
+ $this->assertInstanceOf('Cake\Routing\Route\Route', $routes[0]);
+ $this->assertEquals($collection->get(0), $routes[0]);
+ $this->assertInstanceOf('Cake\Routing\Route\Route', $routes[5]);
+ $this->assertEquals($collection->get(5), $routes[5]);
+ }
+
+/**
* Test mapResources with a plugin and prefix.
*
* @return void
|
Test that RouterCollection::routes() gets the list of connected routes.
|
cakephp_cakephp
|
train
|
php
|
1382360abd9cf55bf8483fc6f6177e5fb400df38
|
diff --git a/plugins/websocket/src/main/java/greycat/websocket/WSServerWithWorkers.java b/plugins/websocket/src/main/java/greycat/websocket/WSServerWithWorkers.java
index <HASH>..<HASH> 100644
--- a/plugins/websocket/src/main/java/greycat/websocket/WSServerWithWorkers.java
+++ b/plugins/websocket/src/main/java/greycat/websocket/WSServerWithWorkers.java
@@ -303,9 +303,12 @@ public class WSServerWithWorkers implements WebSocketConnectionCallback, Callbac
}
break;
case WorkerAffinity.TASK_WORKER: {
+ //format: <byte>#<int>#<int>#
BufferIterator it = jobBuffer.iterator();
Buffer bufferTypeBufferView = it.next();
- Buffer respChannelBufferView = it.next();
+
+ it.skip(5); // skip mailbox <int>#
+
Buffer callbackBufferView = it.next();
int callbackId = Base64.decodeToIntWithBounds(callbackBufferView, 0, callbackBufferView.length());
|
Fix WSServer with workers (protect against callback <I>)
|
datathings_greycat
|
train
|
java
|
fe274d499e455be321ff3c9d5fc9dafd8ffa454c
|
diff --git a/shell.js b/shell.js
index <HASH>..<HASH> 100755
--- a/shell.js
+++ b/shell.js
@@ -63,7 +63,7 @@ function loadBot() {
}
loadBot();
-fs.watch(opts.brain, {recursive: true}, function() {
+fs.watch(opts.brain, {recursive: false}, function() {
console.log("");
console.log('[INFO] Brain changed, reloading bot.');
rl.prompt();
@@ -98,8 +98,10 @@ rl.on('line', function(cmd) {
// Handle commands.
if (cmd === "/help") {
help();
+ } else if (cmd.indexOf("/data") === 0) {
+ console.log(bot.getUservars("localuser"));
} else if (cmd.indexOf("/eval ") === 0) {
- eval(cmd.replace("/eval ", ""));
+ console.log(eval(cmd.replace("/eval ", "")));
} else if (cmd.indexOf("/log ") === 0) {
console.log(eval(cmd.replace("/log ", "")));
} else if (cmd === "/quit") {
|
Make fs.watch non recursive (could be another option flag if needed)
|
aichaos_rivescript-js
|
train
|
js
|
0d82128b2e59c9142f1297bae13ed616405996ee
|
diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
index <HASH>..<HASH> 100644
--- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
+++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
@@ -419,6 +419,13 @@ class UnitOfWorkTest extends OrmTestCase
];
}
+ public function testRegisteringAManagedInstanceRequiresANonEmptyIdentifier()
+ {
+ $this->expectException(ORMInvalidArgumentException::class);
+
+ $this->_unitOfWork->registerManaged(new EntityWithBooleanIdentifier(), [], []);
+ }
+
/**
* @dataProvider entitiesWithInvalidIdentifiersProvider
*
|
Registering a managed entity with an empty identifier is to be disallowed
|
doctrine_orm
|
train
|
php
|
8ab32a0b60efc3a31882aebc3f5523dc2c416b93
|
diff --git a/beamline/models.py b/beamline/models.py
index <HASH>..<HASH> 100644
--- a/beamline/models.py
+++ b/beamline/models.py
@@ -202,11 +202,12 @@ class Models(object):
.format(cnt=cnt, name=e.name, type=e.typename, classname=e.__class__.__name__))
cnt += 1
- def draw(self, startpoint=(0, 0), showfig=False):
+ def draw(self, startpoint=(0, 0), mode='plain', showfig=False):
""" lattice visualization
:param startpoint: start drawing point coords, default: (0, 0)
:param showfig: show figure or not, default: False
+ :param mode: artist mode, 'plain' or 'fancy', 'plain' by default
"""
p0 = startpoint
angle = 0.0
@@ -214,7 +215,7 @@ class Models(object):
xmin0, xmax0, ymin0, ymax0 = 0, 0, 0, 0
xmin, xmax, ymin, ymax = 0, 0, 0, 0
for ele in self._lattice_eleobjlist:
- ele.setDraw(p0=p0, angle=angle)
+ ele.setDraw(p0=p0, angle=angle, mode=mode)
angle += ele.next_inc_angle
#print ele.name, ele.next_inc_angle, angle
patchlist.extend(ele._patches)
|
add artist mode option of method draw()
- by defauly mode is 'plain', which shows flat rectangles
for magnetic elements
- 'fancy' mode enabled when mode is set to be 'fancy' with
much more beautiful illustration
|
archman_beamline
|
train
|
py
|
48e02d07c6fb0e4f7b1eca369205b04c35bbfcff
|
diff --git a/test.py b/test.py
index <HASH>..<HASH> 100644
--- a/test.py
+++ b/test.py
@@ -7,6 +7,7 @@ import tempfile
import sys
import sh
import platform
+from functools import wraps
# we have to use the real path because on osx, /tmp is a symlink to
# /private/tmp, and so assertions that gettempdir() == sh.pwd() will fail
@@ -24,19 +25,27 @@ THIS_DIR = os.path.dirname(os.path.abspath(__file__))
skipUnless = getattr(unittest, "skipUnless", None)
if not skipUnless:
- def skipUnless(*args, **kwargs):
- def wrapper(thing): return thing
+ # our stupid skipUnless wrapper for python2.6
+ def skipUnless(condition, reason):
+ def wrapper(test):
+ if condition:
+ return test
+ else:
+ @wraps(test)
+ def skip(*args, **kwargs):
+ return
+ return skip
return wrapper
requires_posix = skipUnless(os.name == "posix", "Requires POSIX")
requires_utf8 = skipUnless(sh.DEFAULT_ENCODING == "UTF-8", "System encoding must be UTF-8")
-def create_tmp_test(code):
+def create_tmp_test(code, prefix="tmp"):
""" creates a temporary test file that lives on disk, on which we can run
python with sh """
- py = tempfile.NamedTemporaryFile()
+ py = tempfile.NamedTemporaryFile(prefix=prefix)
if IS_PY3:
code = bytes(code, "UTF-8")
py.write(code)
|
skipUnless never actually worked in py<I>, also add prefix ability to named temp test
|
amoffat_sh
|
train
|
py
|
6dd65d2d9ad42fdf8a645978495d4879d0c7dc06
|
diff --git a/dev/com.ibm.ws.io.smallrye.graphql/src/io/smallrye/graphql/cdi/config/GraphQLConfig.java b/dev/com.ibm.ws.io.smallrye.graphql/src/io/smallrye/graphql/cdi/config/GraphQLConfig.java
index <HASH>..<HASH> 100644
--- a/dev/com.ibm.ws.io.smallrye.graphql/src/io/smallrye/graphql/cdi/config/GraphQLConfig.java
+++ b/dev/com.ibm.ws.io.smallrye.graphql/src/io/smallrye/graphql/cdi/config/GraphQLConfig.java
@@ -43,11 +43,6 @@ public class GraphQLConfig implements Config {
private String fieldVisibility = Config.FIELD_VISIBILITY_DEFAULT;
- public GraphQLConfig() {
- //hideList = mergeList(hideList, blackList);
- //showList = mergeList(showList, whiteList);
- }
-
@Override
public String getDefaultErrorMessage() {
return defaultErrorMessage;
|
Remove unnecessary comments / empty constructor
|
OpenLiberty_open-liberty
|
train
|
java
|
48ee061b2e57c683d431063591f85a4cbfd53f6e
|
diff --git a/Swat/SwatTableViewColumn.php b/Swat/SwatTableViewColumn.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatTableViewColumn.php
+++ b/Swat/SwatTableViewColumn.php
@@ -514,6 +514,8 @@ class SwatTableViewColumn extends SwatCellRendererContainer
*/
protected function getCSSClassNames()
{
+ $classes = array();
+
// instance specific class
if ($this->id !== null && !$this->has_auto_id) {
$column_class = str_replace('_', '-', $this->id);
@@ -521,7 +523,7 @@ class SwatTableViewColumn extends SwatCellRendererContainer
}
// base classes
- $classes = $this->getBaseCSSClassNames();
+ $classes = array_merge($classes, $this->getBaseCSSClassNames());
// user-specified classes
$classes = array_merge($classes, $this->classes);
|
include instance specific class fixes (<I>) SwatTableViewColumns aren't
outputting their IDs as classes, as per the documentation.
svn commit r<I>
|
silverorange_swat
|
train
|
php
|
3d1badb952866d08617e1515de88d4a0abb87a1f
|
diff --git a/web/db/mongo/__init__.py b/web/db/mongo/__init__.py
index <HASH>..<HASH> 100644
--- a/web/db/mongo/__init__.py
+++ b/web/db/mongo/__init__.py
@@ -65,7 +65,7 @@ class MongoDBConnection(object):
client = self.client = MongoClient(self.uri, **self.config)
if self.minimum:
- version = tuple(client.server_info()['version'].split('.'))
+ version = tuple(int(i) for i in client.server_info()['version'].split('.'))
if version < self.minimum:
raise RuntimeError("Unsupported MongoDB server version: " + ".".join(version))
|
Correctly compare MongoDB versions.
|
marrow_web.db
|
train
|
py
|
ad1dfc0b5ee25350cf1415323419888b7fc95dcb
|
diff --git a/src/Database/Pivot.php b/src/Database/Pivot.php
index <HASH>..<HASH> 100644
--- a/src/Database/Pivot.php
+++ b/src/Database/Pivot.php
@@ -43,10 +43,13 @@ class Pivot extends Model
* @param bool $exists
* @return void
*/
- public function __construct(ModelBase $parent, $attributes, $table, $exists = FALSE)
+ public function __construct(ModelBase $parent = null, $attributes = [], $table = null, $exists = FALSE)
{
parent::__construct();
+ if (is_null($parent))
+ return;
+
// The pivot model is a "dynamic" model since we will set the tables dynamically
// for the instance. This allows it work for any intermediate tables for the
// many to many relationship that are defined by this developer's classes.
|
Fix error with Pivot class caused by newly introduced Attribute class in L8+
|
tastyigniter_flame
|
train
|
php
|
918b45befd6a8aff7c3941b7022f0d125ada12a4
|
diff --git a/rdp_darwin.go b/rdp_darwin.go
index <HASH>..<HASH> 100644
--- a/rdp_darwin.go
+++ b/rdp_darwin.go
@@ -22,6 +22,17 @@
package main
+import (
+ "fmt"
+)
+
func rdpLaunchNative(instance *Instance, private bool, index int, arguments []string, prompt bool, username string) error {
+ file, err := rdpCreateFile(instance, private, index, username)
+ if err != nil {
+ return err
+ }
+
+ fmt.Println(file, instance.AdminPassword)
+
return nil
}
|
Create an RDP file on Mac OS X.
|
douglaswth_rsrdp
|
train
|
go
|
d2c710ba0d78f861ff0e1dfef2a557f2fc1a3772
|
diff --git a/vsphere/distributed_virtual_switch_structure.go b/vsphere/distributed_virtual_switch_structure.go
index <HASH>..<HASH> 100644
--- a/vsphere/distributed_virtual_switch_structure.go
+++ b/vsphere/distributed_virtual_switch_structure.go
@@ -749,7 +749,7 @@ func schemaDVSCreateSpec() map[string]*schema.Schema {
"version": {
Type: schema.TypeString,
Computed: true,
- Description: "The version of this virtual switch. Allowed versions are 7.0.0, 6.5.0, 6.0.0, 5.5.0, 5.1.0, and 5.0.0.",
+ Description: "The version of this virtual switch. Allowed versions are 7.0.3, 7.0.0, 6.6.0, 6.5.0, 6.0.0, 5.5.0, 5.1.0, and 5.0.0.",
Optional: true,
ValidateFunc: validation.StringInSlice(dvsVersions, false),
},
|
Update schemaDVSCreateSpec description
Updates schemaDVSCreateSpec description to include <I> and <I>
|
terraform-providers_terraform-provider-vsphere
|
train
|
go
|
5e66008ba1520a21df7b962ffb3943b539d389ba
|
diff --git a/superset/utils/core.py b/superset/utils/core.py
index <HASH>..<HASH> 100644
--- a/superset/utils/core.py
+++ b/superset/utils/core.py
@@ -340,6 +340,8 @@ def base_json_conv(obj):
return str(obj)
elif isinstance(obj, timedelta):
return str(obj)
+ elif isinstance(obj, memoryview):
+ return str(obj.tobytes(), 'utf8')
elif isinstance(obj, bytes):
try:
return '{}'.format(obj)
|
Add handling for memoryview (#<I>)
|
apache_incubator-superset
|
train
|
py
|
9c6c851b27f5f189672712056abb4b2d69dfece8
|
diff --git a/bcloud/MimeProvider.py b/bcloud/MimeProvider.py
index <HASH>..<HASH> 100644
--- a/bcloud/MimeProvider.py
+++ b/bcloud/MimeProvider.py
@@ -60,7 +60,9 @@ class MimeProvider:
return (pixbuf, file_type)
else:
key = (UNKNOWN, icon_size)
- pixbuf = self._data.get(key)
+ pixbuf = self._data.get(key, None)
+ if not pixbuf:
+ pixbuf = self.get('/placeholder', isdir, icon_size)[0]
return (pixbuf, file_type)
def get_icon_name(self, path, isdir):
|
Fixed: loading UNKNOWN icon
|
XuShaohua_bcloud
|
train
|
py
|
c1d6031deabd90394aa5e691b751853a26760070
|
diff --git a/app/ui/components/RunLog.js b/app/ui/components/RunLog.js
index <HASH>..<HASH> 100644
--- a/app/ui/components/RunLog.js
+++ b/app/ui/components/RunLog.js
@@ -9,8 +9,7 @@ export default class RunLog extends Component {
}
render () {
- const { style, commands } = this.props
-
+ const {style, commands} = this.props
const makeCommandToTemplateMapper = (depth) => (command) => {
const {id, isCurrent, description, children, handledAt} = command
const style = [styles[`indent-${depth}`]]
|
rebase app-3-0-nested-commands-rebase, remove mock nested command data, use generated robot commands
|
Opentrons_opentrons
|
train
|
js
|
87b7de4d0a5b9adcd5199a6b77c1fff46a5ff5e2
|
diff --git a/src/Composer/Package/Version/VersionParser.php b/src/Composer/Package/Version/VersionParser.php
index <HASH>..<HASH> 100644
--- a/src/Composer/Package/Version/VersionParser.php
+++ b/src/Composer/Package/Version/VersionParser.php
@@ -178,7 +178,7 @@ class VersionParser
*/
public function parseNumericAliasPrefix($branch)
{
- if (preg_match('/^(?<version>(\d+\\.)*\d+)(?:\.x)?-dev$/i', $branch, $matches)) {
+ if (preg_match('/^(?P<version>(\d+\\.)*\d+)(?:\.x)?-dev$/i', $branch, $matches)) {
return $matches['version'].".";
}
|
Add the P character to the regex pattern
According to <URL>: Compilation failed: unrecognized character after (?< at offset 4
Exception trace:
() at phar:///var/www/git/smmqa/app/admin/composer.phar/src/Composer/Package/Version/VersionParser.php:<I>
|
mothership-ec_composer
|
train
|
php
|
d885c1948878c3dade62ef30bcf8049ab252f505
|
diff --git a/lib/quadrigacx/client/private.rb b/lib/quadrigacx/client/private.rb
index <HASH>..<HASH> 100644
--- a/lib/quadrigacx/client/private.rb
+++ b/lib/quadrigacx/client/private.rb
@@ -60,7 +60,7 @@ module QuadrigaCX
#
# coin – The coin type
# amount – The amount to withdraw.
- # address – The litecoin address we will send the amount to.
+ # address – The coin type's address we will send the amount to.
def withdraw coin, params={}
raise ConfigurationError.new('No coin type specified') unless coin
raise ConfigurationError.new('Invalid coin type specified') unless Coin.valid?(coin)
|
Remove reference of litecoin for deposit_address
|
mhluska_quadrigacx
|
train
|
rb
|
d383782d05cc55e0b346fe3c92e527afca7f94a7
|
diff --git a/lib/statsd.js b/lib/statsd.js
index <HASH>..<HASH> 100644
--- a/lib/statsd.js
+++ b/lib/statsd.js
@@ -358,7 +358,7 @@ Client.prototype.sendMessage = function (message, callback) {
return;
}
- if (!this.socket) {
+ if (!this.socket && callback) {
return callback(new Error('Socket not created properly. Check previous errors for details.'));
}
|
Check callback is set when socket not set
|
brightcove_hot-shots
|
train
|
js
|
b8b43bc0f7510e473903d4e340508d5cae905a3a
|
diff --git a/src/raven.js b/src/raven.js
index <HASH>..<HASH> 100644
--- a/src/raven.js
+++ b/src/raven.js
@@ -338,7 +338,11 @@ function parseDSN(str) {
dsn = {},
i = 7;
- while (i--) dsn[dsnKeys[i]] = m[i] || '';
+ try {
+ while (i--) dsn[dsnKeys[i]] = m[i] || '';
+ } catch(e) {
+ throw new RavenConfigError('Invalid DSN');
+ }
if (dsn.pass)
throw new RavenConfigError('Do not specify your private key in the DSN.');
diff --git a/test/raven.test.js b/test/raven.test.js
index <HASH>..<HASH> 100644
--- a/test/raven.test.js
+++ b/test/raven.test.js
@@ -174,6 +174,16 @@ describe('globals', function() {
// shouldn't hit this
assert.isTrue(false);
});
+
+ it('should raise a RavenConfigError with an invalid DSN', function() {
+ try {
+ parseDSN('lol');
+ } catch(e) {
+ return assert.equal(e.name, 'RavenConfigError');
+ }
+ // shouldn't hit this
+ assert.isTrue(false);
+ });
});
describe('normalizeFrame', function() {
|
Raise a RavenConfigError with an invalid DSN in general
|
getsentry_sentry-javascript
|
train
|
js,js
|
ff9407aba1493f7c5a4b5dc0dbdc3a353f1625b3
|
diff --git a/pyrogram/client/storage/file_storage.py b/pyrogram/client/storage/file_storage.py
index <HASH>..<HASH> 100644
--- a/pyrogram/client/storage/file_storage.py
+++ b/pyrogram/client/storage/file_storage.py
@@ -67,6 +67,17 @@ class FileStorage(SQLiteStorage):
# noinspection PyTypeChecker
self.update_peers(peers.values())
+ def update(self):
+ version = self.version()
+
+ if version == 1:
+ with self.lock, self.conn:
+ self.conn.execute("DELETE FROM peers")
+
+ version += 1
+
+ self.version(version)
+
def open(self):
path = self.database
file_exists = path.is_file()
@@ -97,6 +108,8 @@ class FileStorage(SQLiteStorage):
if not file_exists:
self.create()
+ else:
+ self.update()
with self.conn:
try: # Python 3.6.0 (exactly this version) is bugged and won't successfully execute the vacuum
|
Implement a storage update mechanism (for FileStorage)
The idea is pretty simple: get the current database version and for each
older version, do what needs to be done in order to get to the next
version state. This will make schema changes transparent to the user in
case they are needed.
|
pyrogram_pyrogram
|
train
|
py
|
48b6a29ba7affc43910b91d5b7611420941ab99e
|
diff --git a/lib/Zoop/Shard/User/DataModel/PasswordTrait.php b/lib/Zoop/Shard/User/DataModel/PasswordTrait.php
index <HASH>..<HASH> 100644
--- a/lib/Zoop/Shard/User/DataModel/PasswordTrait.php
+++ b/lib/Zoop/Shard/User/DataModel/PasswordTrait.php
@@ -33,7 +33,6 @@ trait PasswordTrait
/**
* @ODM\String
* @Shard\Serializer\Ignore
- * @Shard\Validator\Required
*/
protected $salt;
|
Remove required from passwordTrait salt. It has a salt generator fallback.
|
zoopcommerce_shard
|
train
|
php
|
1fb776efc7ad27e5ad3e00910c0c321eecbcf34d
|
diff --git a/src/Negotiation/FormatNegotiator.php b/src/Negotiation/FormatNegotiator.php
index <HASH>..<HASH> 100644
--- a/src/Negotiation/FormatNegotiator.php
+++ b/src/Negotiation/FormatNegotiator.php
@@ -68,7 +68,7 @@ class FormatNegotiator extends Negotiator implements FormatNegotiatorInterface
}
}
- // If $priorities is empty or contains a catch-all mime type
+ // if `$priorities` is empty or contains a catch-all mime type
if ($catchAllEnabled) {
return array_shift($acceptHeaders) ?: null;
}
diff --git a/tests/Negotiation/Tests/FormatNegotiatorTest.php b/tests/Negotiation/Tests/FormatNegotiatorTest.php
index <HASH>..<HASH> 100644
--- a/tests/Negotiation/Tests/FormatNegotiatorTest.php
+++ b/tests/Negotiation/Tests/FormatNegotiatorTest.php
@@ -277,6 +277,16 @@ class FormatNegotiatorTest extends TestCase
array(),
'text/html',
),
+ // IE8 Accept header
+ array(
+ 'image/jpeg, application/x-ms-application, image/gif, application/xaml+xml, image/pjpeg, application/x-ms-xbap, */*',
+ array(
+ 'text/html',
+ 'application/xhtml+xml',
+ '*/*'
+ ),
+ 'text/html',
+ ),
);
}
|
Add a failing test with IE8 Accept
|
willdurand_Negotiation
|
train
|
php,php
|
fd421dc8124b7b5281222afcda9372cad7a1688c
|
diff --git a/consumer_group.go b/consumer_group.go
index <HASH>..<HASH> 100644
--- a/consumer_group.go
+++ b/consumer_group.go
@@ -175,6 +175,7 @@ func (c *consumerGroup) Consume(ctx context.Context, topics []string, handler Co
// loop check topic partition numbers changed
// will trigger rebalance when any topic partitions number had changed
+ // avoid Consume function called again that will generate more than loopCheckPartitionNumbers coroutine
go c.loopCheckPartitionNumbers(topics, sess)
// Wait for session exit signal
@@ -462,6 +463,10 @@ func (c *consumerGroup) loopCheckPartitionNumbers(topics []string, session *cons
}
select {
case <-pause.C:
+ case <-session.ctx.Done():
+ Logger.Printf("loop check partition number coroutine will exit, topics %s", topics)
+ // if session closed by other, should be exited
+ return
case <-c.closed:
return
}
|
solve call Consumer function agin, will generate more than loopCheckPartitionsNumber Coroutine
|
Shopify_sarama
|
train
|
go
|
9869fdfd167503883d9d5de55e4c9daaa704854e
|
diff --git a/Processor.php b/Processor.php
index <HASH>..<HASH> 100644
--- a/Processor.php
+++ b/Processor.php
@@ -1170,7 +1170,8 @@ class Processor
// Last resort, use @vocab if set and the result isn't an empty string
if (isset($activectx['@vocab']) && (0 === strpos($iri, $activectx['@vocab'])) &&
- (false !== ($relativeIri = substr($iri, strlen($activectx['@vocab']))))) {
+ (false !== ($relativeIri = substr($iri, strlen($activectx['@vocab'])))) &&
+ (false === isset($activectx[$relativeIri]))) {
if (null === $result) {
return $relativeIri;
}
|
Ensure that @vocab compaction isn't used if the result collides with a term
|
lanthaler_JsonLD
|
train
|
php
|
f7292b0121408a77d9e5ee94a046025c256cd021
|
diff --git a/sos/report/plugins/memory.py b/sos/report/plugins/memory.py
index <HASH>..<HASH> 100644
--- a/sos/report/plugins/memory.py
+++ b/sos/report/plugins/memory.py
@@ -27,7 +27,8 @@ class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
"/proc/pagetypeinfo",
"/proc/vmallocinfo",
"/sys/kernel/mm/ksm",
- "/sys/kernel/mm/transparent_hugepage/enabled"
+ "/sys/kernel/mm/transparent_hugepage/enabled",
+ "/sys/kernel/mm/hugepages"
])
self.add_cmd_output("free", root_symlink="free")
self.add_cmd_output([
|
[memory]:Add support to collect memory logs
This patch updates memory plugin to collect
hugepage memory information
Resolves: #<I>
|
sosreport_sos
|
train
|
py
|
bf2556dbc6172a4cd577f102281f3c51733f9f03
|
diff --git a/src/transforms/ViewLayout.js b/src/transforms/ViewLayout.js
index <HASH>..<HASH> 100644
--- a/src/transforms/ViewLayout.js
+++ b/src/transforms/ViewLayout.js
@@ -81,9 +81,9 @@ function layoutGroup(view, group, _) {
function axisIndices(datum) {
var index = +datum.grid;
return [
- datum.tick ? index++ : -1, // tick index
- datum.label ? index++ : -1, // label index
- index + (+datum.domain) // title index
+ datum.ticks ? index++ : -1, // ticks index
+ datum.labels ? index++ : -1, // labels index
+ index + (+datum.domain) // title index
];
}
|
Update to use standardized axis ticks/labels names.
|
vega_vega-view
|
train
|
js
|
9a42242454ca045b643669bea03bf247963416c6
|
diff --git a/mithril.js b/mithril.js
index <HASH>..<HASH> 100644
--- a/mithril.js
+++ b/mithril.js
@@ -636,7 +636,12 @@ var m = (function app(window, undefined) {
}
else nextSibling.insertAdjacentHTML("beforebegin", data);
}
- else parentElement.insertAdjacentHTML("beforeend", data);
+ else {
+ if (window.Range && window.Range.prototype.createContextualFragment) {
+ parentElement.appendChild($document.createRange().createContextualFragment(data));
+ }
+ else parentElement.insertAdjacentHTML("beforeend", data);
+ }
var nodes = [];
while (parentElement.childNodes[index] !== nextSibling) {
nodes.push(parentElement.childNodes[index]);
|
Fixes #<I>. Firefox insertAdjacentHTML updating text nodes with "beforeend" instead of creating new ones.
|
MithrilJS_mithril.js
|
train
|
js
|
0cf39f47e8afd8ccd3138cdb84735bc1fd773ea4
|
diff --git a/sprd/manager/TextConfigurationManager.js b/sprd/manager/TextConfigurationManager.js
index <HASH>..<HASH> 100644
--- a/sprd/manager/TextConfigurationManager.js
+++ b/sprd/manager/TextConfigurationManager.js
@@ -178,9 +178,6 @@ define(["sprd/manager/ITextConfigurationManager", "flow", 'sprd/entity/Size', "t
paragraph.addChild(span);
}
-
- }
-
configurationObject.textFlow = textFlow;
configurationObject.selection = TextRange.createTextRange(0, 0);
configurationObject.textArea = new Size({
|
Remove extra parenthesis committed in the hurry
|
spreadshirt_rAppid.js-sprd
|
train
|
js
|
bacbdb8a8ac91e9beb3036d2d9f0b8be4d13db3f
|
diff --git a/core-bundle/src/Resources/contao/config/config.php b/core-bundle/src/Resources/contao/config/config.php
index <HASH>..<HASH> 100644
--- a/core-bundle/src/Resources/contao/config/config.php
+++ b/core-bundle/src/Resources/contao/config/config.php
@@ -456,7 +456,7 @@ $GLOBALS['TL_ASSETS'] = array
'COLORBOX' => '1.5.8',
'MEDIAELEMENT' => '2.14.2',
'TABLESORTER' => '2.0.5',
- 'MOOTOOLS' => '1.4.5',
+ 'MOOTOOLS' => '1.5.0',
'COLORPICKER' => '1.4',
'DATEPICKER' => '2.2.0',
'MEDIABOX' => '1.4.6',
|
[Core] Update MooTools to version <I> (see #<I>)
|
contao_contao
|
train
|
php
|
44edd0d431a5e0ba9f9de214b0cab63fe84ceddc
|
diff --git a/class.phpmailer.php b/class.phpmailer.php
index <HASH>..<HASH> 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -1373,8 +1373,8 @@ class PHPMailer {
$signed = tempnam("", "signed");
if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
@unlink($file);
- @unlink($signed);
$body = file_get_contents($signed);
+ @unlink($signed);
} else {
@unlink($file);
@unlink($signed);
|
Don;t delete until we use it.
Issue: #6
|
minmb_phpmailer
|
train
|
php
|
dc5440596cdf8ad27e100e5f7ac7fc1c5fbbc832
|
diff --git a/lib/codemirror.js b/lib/codemirror.js
index <HASH>..<HASH> 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -823,7 +823,7 @@ var CodeMirror = (function() {
}
function updateVerticalScroll(scrollTop) {
- var th = textHeight(), virtualHeight = doc.height * th + 2 * paddingTop(), scrollbarHeight = scroller.clientHeight;
+ var th = textHeight(), virtualHeight = Math.floor(doc.height * th + 2 * paddingTop()), scrollbarHeight = scroller.clientHeight;
scrollbar.style.height = scrollbarHeight + "px";
if (scroller.clientHeight)
scrollbarInner.style.height = virtualHeight + "px";
@@ -1093,7 +1093,7 @@ var CodeMirror = (function() {
// after the scrollbar appears (during updateVerticalScroll()). Only do this if the scrollbar is
// appearing (if it's disappearing, we don't have to worry about the scroll position, and there are
// issues on IE7 if we turn it off too early).
- var virtualHeight = doc.height * th + 2 * paddingTop(), scrollbarHeight = scroller.clientHeight;
+ var virtualHeight = Math.floor(doc.height * th + 2 * paddingTop()), scrollbarHeight = scroller.clientHeight;
if (virtualHeight > scrollbarHeight) scrollbar.style.display = "block";
checkHeights();
} else {
|
Round off fractional pixel in virtual scroll height calculation
|
codemirror_CodeMirror
|
train
|
js
|
94a3def2d7c326d5f88260b38342cf2c5aef4e85
|
diff --git a/src/ofxstatement/tests/test_danske.py b/src/ofxstatement/tests/test_danske.py
index <HASH>..<HASH> 100644
--- a/src/ofxstatement/tests/test_danske.py
+++ b/src/ofxstatement/tests/test_danske.py
@@ -36,8 +36,9 @@ def doctest_DanskeCsvStatementParser():
'Paslaugų ir komisinių pajamos už gaunamus tarptautinius pervedimus USD'
>>> l.date
datetime.datetime(2012, 3, 1, 0, 0)
- >>> l.id
- '5865011796238881019'
+ >>> hash_expected = str(abs(hash((l.date,l.memo,l.amount))))
+ >>> l.id == hash_expected
+ True
Second line is incoming money
>>> l = statement.lines[1]
|
Don’t compare result of hash() against absolute value.
hash() is not guaranteed to give constant results, and actually it has
been changing between different versions of Python. Therefore, id
attribute (which is generated via hash()) shouldn’t be compared to the
absolute value, but to the value generated by the expected algorithm.
|
kedder_ofxstatement
|
train
|
py
|
5275078dfa98d7e78487ade524cd9c9c7ab055e6
|
diff --git a/test/unit/gulp.spec.js b/test/unit/gulp.spec.js
index <HASH>..<HASH> 100644
--- a/test/unit/gulp.spec.js
+++ b/test/unit/gulp.spec.js
@@ -9,7 +9,7 @@ var
_ = require('lodash')
;
-describe.only('gulp', function() {
+describe('gulp', function() {
var folder = process.cwd() + '/test-project/';
var program = {
|
chore: Removed *only* for one test suite
|
quasarframework_quasar-cli
|
train
|
js
|
b1991a9fdf175d206e2cae282870277cab219d41
|
diff --git a/salt/states/git.py b/salt/states/git.py
index <HASH>..<HASH> 100644
--- a/salt/states/git.py
+++ b/salt/states/git.py
@@ -77,7 +77,7 @@ def latest(name,
__salt__['git.checkout'](target, rev, user=runas)
if submodules:
- __salt__['git.submodule'](target, user=runas)
+ __salt__['git.submodule'](target, user=runas, opts='--recursive')
new_rev = __salt__['git.revision'](cwd=target, user=runas)
if current_rev != new_rev:
|
Run git submodule with `--recursive`,.
To make sure nested submodules are synced too.
|
saltstack_salt
|
train
|
py
|
60ba98e981a0c35137fa7ea3e3764044ddd5c118
|
diff --git a/kie-internal/src/main/java/org/kie/internal/task/api/model/TaskEvent.java b/kie-internal/src/main/java/org/kie/internal/task/api/model/TaskEvent.java
index <HASH>..<HASH> 100644
--- a/kie-internal/src/main/java/org/kie/internal/task/api/model/TaskEvent.java
+++ b/kie-internal/src/main/java/org/kie/internal/task/api/model/TaskEvent.java
@@ -16,15 +16,14 @@
package org.kie.internal.task.api.model;
import java.io.Externalizable;
-
-import org.kie.api.task.model.User;
-
+import java.util.Date;
public interface TaskEvent extends Externalizable {
public enum TaskEventType{STARTED, ACTIVATED, COMPLETED,
STOPPED, EXITED, FAILED, ADDED,
- CLAIMED, SKIPPED, SUSPENDED, CREATED, FORWARDED, RELEASED};
+ CLAIMED, SKIPPED, SUSPENDED, CREATED,
+ FORWARDED, RELEASED, RESUMED, DELEGATED};
long getId();
@@ -38,8 +37,12 @@ public interface TaskEvent extends Externalizable {
void setType(TaskEventType type);
- User getUser();
+ String getUserId();
- void setUser(User user);
+ void setUserId(String userId);
+
+ Date getLogTime();
+
+ void setLogTime(Date timestamp);
}
|
- updating task event interface for keeping track of the task activity
|
kiegroup_drools
|
train
|
java
|
d5420a7708c249b3385db6518c7ad45461753b6f
|
diff --git a/src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php b/src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php
index <HASH>..<HASH> 100644
--- a/src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php
+++ b/src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php
@@ -48,6 +48,7 @@ class FunctionReturnTypeProvider
/**
* @param class-string<FunctionReturnTypeProviderInterface> $class
+ * @psalm-suppress PossiblyUnusedParam
* @return void
*/
public function register(string $class)
|
Suppress PossiblyUnusedParam for PHP <I>
|
vimeo_psalm
|
train
|
php
|
a89e6884abefaeeef2b08fcc027f3cf2e31319d8
|
diff --git a/spec/opal/stdlib/native/hash_spec.rb b/spec/opal/stdlib/native/hash_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/opal/stdlib/native/hash_spec.rb
+++ b/spec/opal/stdlib/native/hash_spec.rb
@@ -40,5 +40,12 @@ describe Hash do
native = obj.to_n
`#{native}.a_key.key`.should == 1
end
+
+ it 'passes Ruby objects that cannot be converted' do
+ object = Object.new
+ hash = { foo: object }
+ native = hash.to_n
+ expect(`#{native}.foo`).to eq object
+ end
end
end
diff --git a/stdlib/native.rb b/stdlib/native.rb
index <HASH>..<HASH> 100644
--- a/stdlib/native.rb
+++ b/stdlib/native.rb
@@ -33,7 +33,7 @@ module Native
return #{value.to_n};
}
else {
- return nil;
+ return value;
}
}
end
|
Return original value if it cannot be nativized
Native.try_convert makes a best effort to return a native JS object, but
the Ruby object itself can be the native JS object you want and nil
almost never is.
|
opal_opal
|
train
|
rb,rb
|
e8aab78ec6012455fc6881c3809f3bc7de4c1787
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -5,7 +5,7 @@ SimpleCov.start
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
$LOAD_PATH.unshift(File.dirname(__FILE__))
require 'rspec'
-require 'upnp/ssdp'
+require 'upnp'
# Requires supporting files with custom matchers and macros, etc,
# in ./support/ and its subdirectories.
|
Fixed require of old upnp/ssdp
|
turboladen_playful
|
train
|
rb
|
887bd4e86e8f37eed3befae2c834bc499e50a918
|
diff --git a/lib/middleman-search/extension.rb b/lib/middleman-search/extension.rb
index <HASH>..<HASH> 100644
--- a/lib/middleman-search/extension.rb
+++ b/lib/middleman-search/extension.rb
@@ -26,7 +26,7 @@ module Middleman
end
def search_index_path
- app.config[:http_prefix] + sitemap.find_resource_by_path(extensions[:search].options[:index_path]).destination_path
+ (config || app.config)[:http_prefix] + sitemap.find_resource_by_path(extensions[:search].options[:index_path]).destination_path
end
end
end
|
Fix: search_index_path works in MM3
`app` is not defined for helpers in MM3 - but `config` is
|
manastech_middleman-search
|
train
|
rb
|
1ad6a01c3e9e6bed8b24514fcdcf54bb14459daa
|
diff --git a/server/src/main/java/org/jboss/as/server/deployment/Phase.java b/server/src/main/java/org/jboss/as/server/deployment/Phase.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/org/jboss/as/server/deployment/Phase.java
+++ b/server/src/main/java/org/jboss/as/server/deployment/Phase.java
@@ -413,6 +413,7 @@ public enum Phase {
public static final int INSTALL_DEPLOYMENT_REPOSITORY = 0x1E00;
public static final int INSTALL_EJB_MANAGEMENT_RESOURCES = 0x1F00;
public static final int INSTALL_APPLICATION_CLIENT = 0x2000;
+ public static final int INSTALL_DSXML_DEPLOYMENT = 0x2010;
// CLEANUP
public static final int CLEANUP_REFLECTION_INDEX = 0x0100;
|
Add begning of deployment model and split processor into parse and install
was: <I>e3b<I>cfbca<I>bafd<I>c8b1f9a2e0
|
wildfly_wildfly-core
|
train
|
java
|
d7b2374c8c95855906d7b1a83faf86f3a3b3a899
|
diff --git a/acceptance/tests/concurrency/ticket_2659_concurrent_catalog_requests.rb b/acceptance/tests/concurrency/ticket_2659_concurrent_catalog_requests.rb
index <HASH>..<HASH> 100644
--- a/acceptance/tests/concurrency/ticket_2659_concurrent_catalog_requests.rb
+++ b/acceptance/tests/concurrency/ticket_2659_concurrent_catalog_requests.rb
@@ -4,6 +4,7 @@ test_name "concurrent catalog requests (PUP-2659)"
confine :except, :platform => 'windows'
confine :except, :platform => /osx/ # see PUP-4820
confine :except, :platform => 'solaris'
+confine :except, :platform => 'aix'
step "setup a manifest"
|
(PUP-<I>) Skip concurrent requests test on AIX
This commit skips AIX agents when conducting the
`concurrency/ticket_<I>_concurrent_catalog_requests` acceptance
test.
|
puppetlabs_puppet
|
train
|
rb
|
9c12b6123a641794ff29aa61795021b2aeab4e9f
|
diff --git a/src/services/Terminal.js b/src/services/Terminal.js
index <HASH>..<HASH> 100644
--- a/src/services/Terminal.js
+++ b/src/services/Terminal.js
@@ -1,4 +1,4 @@
-const {yellow, blue} = require('chalk');
+const {yellow, red, blue} = require('chalk');
const readline = require('../lib/readline/readline');
const EventEmitter = require('events');
const {Readable} = require('stream');
@@ -111,7 +111,7 @@ module.exports = class Terminal extends EventEmitter {
error(text) {
this._hidePrompt();
- this._console.error(text);
+ this._console.error(red(text));
this._restorePrompt();
}
|
Print app console.error output in red
Consistent with yellow console.warn output. To be supplemented with
icons in the future.
Change-Id: I<I>bc9f<I>ffaab1a<I>ea1f<I>c3c<I>f8fe<I>
|
eclipsesource_tabris-js-cli
|
train
|
js
|
bca8e474ffa215ec7f55d4fd674a865066cc781e
|
diff --git a/nolds/measures.py b/nolds/measures.py
index <HASH>..<HASH> 100644
--- a/nolds/measures.py
+++ b/nolds/measures.py
@@ -280,13 +280,18 @@ def lyap_r(data, emb_dim=10, lag=None, min_tsep=None, tau=1, min_vectors=20,
acorr = np.roll(acorr, n - 1)
eps = acorr[n - 1] * (1 - 1.0 / np.e)
lag = 1
+ # small helper function to calculate resulting number of vectors for a
+ # given lag value
+ def nb_vectors(lag_value):
+ return max(0, n - (emb_dim - 1) * lag_value)
+ # find lag
for i in range(1,n):
if acorr[n - 1 + i] < eps \
or acorr[n - 1 - i] < eps \
- or 1.0 * n / emb_dim * i < min_vectors:
+ or nb_vectors(i) < min_vectors:
lag = i
break
- if 1.0 * n / emb_dim * lag < min_vectors:
+ if nb_vectors(lag) < min_vectors:
# FIXME shouldn't we reset lag here?
msg = "autocorrelation declined too slowly to find suitable lag"
warnings.warn(msg, RuntimeWarning)
|
fixes calculation of number of vectors in lyap_r
|
CSchoel_nolds
|
train
|
py
|
1cd3842a25a1f830e923c9df18799bb889398d61
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -38,7 +38,7 @@ function gulpInjectFile(opts) {
})
.join('\n');
- content = content.replace(match, injectContent);
+ content = content.replace(match, function() { return injectContent; });
}
file.contents = new Buffer(content);
|
ignore special symbols when doing file content replace
|
mzahor_gulp-inject-file
|
train
|
js
|
8344a3988a7b39604ee9d331ac0157956283d24a
|
diff --git a/src/aperture.js b/src/aperture.js
index <HASH>..<HASH> 100644
--- a/src/aperture.js
+++ b/src/aperture.js
@@ -5,7 +5,7 @@ var _xaperture = require('./internal/_xaperture');
/**
- * Returns a new list, composed of n-tuples of consecutive elements If `n` is
+ * Returns a new list, composed of n-tuples of consecutive elements. If `n` is
* greater than the length of the list, an empty list is returned.
*
* Acts as a transducer if a transformer is given in list position.
|
aperture.js comment lost a comma
|
ramda_ramda
|
train
|
js
|
027f1a7a7c7f749e99f1be490b09bda36396210c
|
diff --git a/ara/cli/host.py b/ara/cli/host.py
index <HASH>..<HASH> 100644
--- a/ara/cli/host.py
+++ b/ara/cli/host.py
@@ -40,7 +40,7 @@ class HostList(Lister):
metavar="<order>",
default="-updated",
help=(
- "Orders results by a field ('id', 'created', 'updated', 'name')\n"
+ "Orders hosts by a field ('id', 'created', 'updated', 'name')\n"
"Defaults to '-updated' descending so the most recent host is at the top.\n"
"The order can be reversed by omitting the '-': ara host list --order=updated"
),
diff --git a/ara/cli/playbook.py b/ara/cli/playbook.py
index <HASH>..<HASH> 100644
--- a/ara/cli/playbook.py
+++ b/ara/cli/playbook.py
@@ -51,7 +51,7 @@ class PlaybookList(Lister):
metavar="<order>",
default="-started",
help=(
- "Orders results by a field ('id', 'created', 'updated', 'started', 'ended', 'duration')\n"
+ "Orders playbooks by a field ('id', 'created', 'updated', 'started', 'ended', 'duration')\n"
"Defaults to '-started' descending so the most recent playbook is at the top.\n"
"The order can be reversed by omitting the '-': ara playbook list --order=started"
),
|
CLI: Disambiguate which kind of resource is ordered with --order
"results" might come off as task results instead of "results" from the
query.
Change-Id: I<I>d4f3ec<I>cdd8f<I>edc<I>d<I>
|
ansible-community_ara
|
train
|
py,py
|
3dd9dc5e63084d17d157195de863b22d2246f63c
|
diff --git a/test/unit/test_timeout.py b/test/unit/test_timeout.py
index <HASH>..<HASH> 100644
--- a/test/unit/test_timeout.py
+++ b/test/unit/test_timeout.py
@@ -26,7 +26,7 @@ class TestTimeout:
while to.check():
sleep(0.01)
cnt += 1
- if cnt == 4:
+ if cnt == 2:
break
else:
assert False
|
Unit test: shorten TestTimeout.no_timeout so it doesn't fail on certain systems.
|
mbedmicro_pyOCD
|
train
|
py
|
801057079a536a54d289610576111be7a7565fee
|
diff --git a/java/datastore/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java b/java/datastore/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java
index <HASH>..<HASH> 100644
--- a/java/datastore/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java
+++ b/java/datastore/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java
@@ -56,12 +56,12 @@ import java.util.concurrent.TimeUnit;
*
* {@literal @}Before
* public void setUp() throws LocalDevelopmentDatastoreException {
- * datastore.clearDatastore();
+ * datastore.clear();
* }
*
* {@literal @}AfterClass
* public static void stopLocalDatastore() throws LocalDevelopmentDatastoreException {
- * datastore.stopDatastore();
+ * datastore.stop();
* }
*
* {@literal @}Test
|
changed class usage in comment to match code
In the class comment, the example code was invoking the wrong methods:
datastore.stopDatastore() is named datastore.stop()
datastore.clearDatastore() is named datastore.clear()
|
GoogleCloudPlatform_google-cloud-datastore
|
train
|
java
|
f8e58b165bf1864d8082cad1271c998c88832ae9
|
diff --git a/src/org/opencms/i18n/CmsLocaleManager.java b/src/org/opencms/i18n/CmsLocaleManager.java
index <HASH>..<HASH> 100644
--- a/src/org/opencms/i18n/CmsLocaleManager.java
+++ b/src/org/opencms/i18n/CmsLocaleManager.java
@@ -947,6 +947,9 @@ public class CmsLocaleManager implements I_CmsEventListener {
// set default locale
m_defaultLocale = m_defaultLocales.get(0);
try {
+ // use a seed for initializing the language detection for making sure the
+ // same probabilities are detected for the same document contents
+ DetectorFactory.setSeed(42L);
DetectorFactory.loadProfile(loadProfiles(getAvailableLocales()));
} catch (Exception e) {
LOG.error(Messages.get().getBundle().key(Messages.INIT_I18N_LANG_DETECT_FAILED_0), e);
|
Use a seed for initializing the language detection.
|
alkacon_opencms-core
|
train
|
java
|
ed2c6293bfa808b9c7f7baafc2ce4e5969f9647c
|
diff --git a/support/cas-server-support-hazelcast-ticket-registry/src/main/java/org/apereo/cas/ticket/registry/HazelcastTicketRegistry.java b/support/cas-server-support-hazelcast-ticket-registry/src/main/java/org/apereo/cas/ticket/registry/HazelcastTicketRegistry.java
index <HASH>..<HASH> 100644
--- a/support/cas-server-support-hazelcast-ticket-registry/src/main/java/org/apereo/cas/ticket/registry/HazelcastTicketRegistry.java
+++ b/support/cas-server-support-hazelcast-ticket-registry/src/main/java/org/apereo/cas/ticket/registry/HazelcastTicketRegistry.java
@@ -155,7 +155,7 @@ public class HazelcastTicketRegistry extends AbstractTicketRegistry implements C
private IMap<String, Ticket> getTicketMapInstance(final String mapName) {
try {
final IMap<String, Ticket> inst = hazelcastInstance.getMap(mapName);
- LOGGER.debug("Located Hazelcast map instance [{}] for [{}]", inst, mapName);
+ LOGGER.debug("Located Hazelcast map instance [{}]", mapName);
return inst;
} catch (final Exception e) {
LOGGER.error(e.getMessage(), e);
|
Slf4j prints entire Map contents (#<I>)
Found this in <I>.x load testing.
The Sf4j Logger will iterate collections calling toSting() on each entry in a map. This causes severe degradation once the map reaches even a trivial size.
Changed the debug statement to just echo the mapName and not pass instance to the LOGGER.debug().
|
apereo_cas
|
train
|
java
|
c5fcc53971c33d6c910877a0374f4574fd459b8a
|
diff --git a/main_test.go b/main_test.go
index <HASH>..<HASH> 100644
--- a/main_test.go
+++ b/main_test.go
@@ -30,7 +30,7 @@ var _ = Describe("main", func() {
})
Context("when extra arguments are provided", func() {
It("prints help and exits", func() {
- cmd := exec.Command(commandPath, "find", "this")
+ cmd := exec.Command(commandPath, "version", "this")
session, err := Start(cmd, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred())
<-session.Exited
|
Fix extra args test to hit endpoint that doesn't require authentication
[#<I>]
|
cloudfoundry-incubator_credhub-cli
|
train
|
go
|
48d9e123a2d8b83846ac3fbc7787e22bd1afd4a9
|
diff --git a/requirements/index.php b/requirements/index.php
index <HASH>..<HASH> 100644
--- a/requirements/index.php
+++ b/requirements/index.php
@@ -102,6 +102,12 @@ $requirements=array(
t('yii','All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>'),
t('yii','Required for MSSQL database with the driver provided by Microsoft.')),
array(
+ t('yii','PDO ODBC extension'),
+ false,
+ extension_loaded('pdo_odbc'),
+ t('yii','All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>'),
+ t('yii','Required in case database interaction will be through ODBC layer.')),
+ array(
t('yii','Memcache extension'),
false,
extension_loaded("memcache") || extension_loaded("memcached"),
|
Add ODBC to the requirements checker
|
yiisoft_yii
|
train
|
php
|
e31c5e206a85396b900ad03ff19718b6824c5eff
|
diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToMethod.java b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToMethod.java
index <HASH>..<HASH> 100644
--- a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToMethod.java
+++ b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToMethod.java
@@ -578,7 +578,6 @@ public class ToMethod {
String prefix = isCollection ? "addNew" : "withNew";
String suffix = "Like";
- prefix += BuilderUtils.fullyQualifiedNameDiff(property);
String methodName = prefix + captializeFirst(isCollection
? Singularize.FUNCTION.apply(property.getName())
: property.getName()) + suffix;
|
nested-like methods do not need a special prefix.
|
sundrio_sundrio
|
train
|
java
|
358b2ac871e4b3627b490cf66a53841455f0316d
|
diff --git a/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleControl.java b/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleControl.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleControl.java
+++ b/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleControl.java
@@ -178,8 +178,8 @@ public abstract class SimpleControl<F extends Field, N extends Node> extends com
*/
@Override
protected void updateStyle(PseudoClass pseudo, boolean newValue) {
-// node.pseudoClassStateChanged(pseudo, newValue);
-// fieldLabel.pseudoClassStateChanged(pseudo, newValue);
+// node.pseudoClassStateChanged(pseudo, newValue); // TODO: Fix Exception
+// fieldLabel.pseudoClassStateChanged(pseudo, newValue); // TODO: Fix Exception
}
@Override
|
added todo for exception that has to be fixed
|
dlemmermann_PreferencesFX
|
train
|
java
|
dde84fa339fc2198520642912b6eba5116956931
|
diff --git a/oceandb_elasticsearch_driver/plugin.py b/oceandb_elasticsearch_driver/plugin.py
index <HASH>..<HASH> 100644
--- a/oceandb_elasticsearch_driver/plugin.py
+++ b/oceandb_elasticsearch_driver/plugin.py
@@ -182,9 +182,10 @@ class Plugin(AbstractPlugin):
if text:
sort = [{"_score": "desc"}] + sort
- text = text.strip()
- if 'did:op:' in text:
- text = text.replace('did:op:', '0x')
+ if isinstance(text, str):
+ text = [text]
+ text = [t.strip() for t in text]
+ text = [t.replace('did:op:', '0x') for t in text if t]
if search_model.query == {}:
query = {'match_all': {}}
|
fix error, better handling of search text
|
oceanprotocol_oceandb-elasticsearch-driver
|
train
|
py
|
97e8b943e52236da9269fefccc8bd7630aa8e779
|
diff --git a/test/unit/middlewares/max-in-flight.spec.js b/test/unit/middlewares/max-in-flight.spec.js
index <HASH>..<HASH> 100644
--- a/test/unit/middlewares/max-in-flight.spec.js
+++ b/test/unit/middlewares/max-in-flight.spec.js
@@ -87,7 +87,7 @@ describe("Test MaxInFlightMiddleware", () => {
FLOW = [];
- return broker.Promise.delay(300).catch(protectReject).then(() => {
+ return broker.Promise.delay(500).catch(protectReject).then(() => {
expect(FLOW).toEqual(expect.arrayContaining([
"handler-4",
"handler-5",
@@ -127,7 +127,7 @@ describe("Test MaxInFlightMiddleware", () => {
FLOW = [];
- return p.delay(300).catch(protectReject).then(() => {
+ return p.delay(500).catch(protectReject).then(() => {
expect(FLOW).toEqual(expect.arrayContaining([
"handler-4",
"QueueIsFullError-9",
@@ -170,7 +170,7 @@ describe("Test MaxInFlightMiddleware", () => {
FLOW = [];
- return p.delay(300).catch(protectReject).then(() => {
+ return p.delay(500).catch(protectReject).then(() => {
expect(FLOW).toEqual(expect.arrayContaining([
"handler-4",
"Error-2",
|
increase delay in MaxInFlight test
|
moleculerjs_moleculer
|
train
|
js
|
72375551faebdafa4fe2df7bc4abc822db4b0040
|
diff --git a/src/main/java/com/github/ansell/csv/access/AccessMapper.java b/src/main/java/com/github/ansell/csv/access/AccessMapper.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/github/ansell/csv/access/AccessMapper.java
+++ b/src/main/java/com/github/ansell/csv/access/AccessMapper.java
@@ -252,7 +252,7 @@ public class AccessMapper {
String[] splitDBFieldSource = DOT_PATTERN.split(nextValueMapping.getInputField());
if (nextValueMapping.getLanguage() == ValueMappingLanguage.ACCESS) {
String[] splitDBFieldDest = DOT_PATTERN.split(nextValueMapping.getMapping());
- if (splitDBFieldDest.length != 2) {
+ if (splitDBFieldDest.length < 2) {
throw new RuntimeException(
"Destination mapping was not in the 'table.column' format: " + nextValueMapping);
}
|
Work around issue with multi-mappings, maybe
Might actually be a bug that needs to be fixed with more code
|
ansell_csvsum
|
train
|
java
|
3252fe0b72aa78adbac44836b8e2468f10895e3f
|
diff --git a/anillo/http/responses.py b/anillo/http/responses.py
index <HASH>..<HASH> 100644
--- a/anillo/http/responses.py
+++ b/anillo/http/responses.py
@@ -1,4 +1,5 @@
-from copy import deepcopy
+from anillo.utils.structures import CaseInsensitiveDict
+from anillo.utils.common import merge_dicts
class Response(dict):
@@ -10,7 +11,7 @@ class Response(dict):
super().__init__({
"body": body if body is not None else self.body,
"status": status if status is not None else self.status,
- "headers": headers if headers is not None else deepcopy(self.headers)
+ "headers": CaseInsensitiveDict(merge_dicts(self.headers, headers)),
})
self.update(**kwargs)
self.__dict__ = self
|
Handle in case insensitive way the response headers.
|
jespino_anillo
|
train
|
py
|
0ff949365dc1592560195aa97afce6a149f93995
|
diff --git a/src/pyshark/capture/inmem_capture.py b/src/pyshark/capture/inmem_capture.py
index <HASH>..<HASH> 100644
--- a/src/pyshark/capture/inmem_capture.py
+++ b/src/pyshark/capture/inmem_capture.py
@@ -58,7 +58,7 @@ class InMemCapture(Capture):
Returns the special tshark parameters to be used according to the configuration of this class.
"""
params = super(InMemCapture, self).get_parameters(packet_count=packet_count)
- params += ['-r', '-']
+ params += ['-i', '-']
return params
@asyncio.coroutine
|
Reverted InMem to work via interface
|
KimiNewt_pyshark
|
train
|
py
|
25ae78fc5a78a06ce629ef9617830cbbcd6157d9
|
diff --git a/app/helpers/list_helper.rb b/app/helpers/list_helper.rb
index <HASH>..<HASH> 100644
--- a/app/helpers/list_helper.rb
+++ b/app/helpers/list_helper.rb
@@ -2,7 +2,7 @@ module ListHelper
ICON_DOWN = "icon-arrow-down"
ICON_UP = "icon-arrow-up"
- BOOTSTRAP_BOOLEAN_MAP = {
+ BOOLEAN_BOOTSTRAP_MAP = {
true => { icon: "icon-white icon-ok", badge: "badge badge-success"},
false => { icon: "icon-white icon-remove", badge: "badge badge-important"}
}
@@ -164,8 +164,8 @@ module ListHelper
# Returns String of the appropriate icon.
def display_boolean(boolean)
content_tag(:span,
- content_tag(:i, "", class: BOOTSTRAP_BOOLEAN_MAP[!!boolean][:icon]),
- class: BOOTSTRAP_BOOLEAN_MAP[!!boolean][:badge])
+ content_tag(:i, "", class: BOOLEAN_BOOTSTRAP_MAP[!!boolean][:icon]),
+ class: BOOLEAN_BOOTSTRAP_MAP[!!boolean][:badge])
end
@@ -257,4 +257,10 @@ module ListHelper
def column_attribute_class(attribute)
"column-#{attribute}".parameterize
end
+
+
+ # Public: Call the BOOLEAN_BOOTSTRAP_MAP
+ def boolean_bootstrap_map
+ BOOLEAN_BOOTSTRAP_MAP
+ end
end
|
Add back boolean helper; change constant name
|
SCPR_outpost
|
train
|
rb
|
4e9dcf3da536a9b956eb092fe9dbc5b2081cfb9d
|
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go
index <HASH>..<HASH> 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go
@@ -692,6 +692,7 @@ func testPropogateStore(ctx context.Context, t *testing.T, store *store, obj *ex
func TestPrefix(t *testing.T) {
codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)
cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
+ defer cluster.Terminate(t)
transformer := prefixTransformer{prefix: []byte("test!")}
testcases := map[string]string{
"custom/prefix": "/custom/prefix",
|
delete etcd socket file for unit tests
This change clean up the environment for etcd3 unit test.
Without this change, "make test" will leave some socket files in
workspace. And these socket files make hack/verify-generated-protobuf.sh
fails.
|
kubernetes_kubernetes
|
train
|
go
|
4a539b3826189996ab1b57eed17d4ad08758109d
|
diff --git a/resources/views/auth/two-factor-auth.blade.php b/resources/views/auth/two-factor-auth.blade.php
index <HASH>..<HASH> 100644
--- a/resources/views/auth/two-factor-auth.blade.php
+++ b/resources/views/auth/two-factor-auth.blade.php
@@ -18,7 +18,7 @@
<h3>{{ trans('dashboard.login.two-factor') }}</h3>
</div>
<br>
- <form method="POST" action="/auth/2fa" accept-charset="UTF-8">
+ <form method="POST" action="{{ route('auth.two-factor') }}" accept-charset="UTF-8">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
|
Use the auth.two-factor route
|
CachetHQ_Cachet
|
train
|
php
|
e2e945e078bf44ed1342e5e62d13734e5a9947d3
|
diff --git a/src/Behat/Behat/Console/BehatApplication.php b/src/Behat/Behat/Console/BehatApplication.php
index <HASH>..<HASH> 100644
--- a/src/Behat/Behat/Console/BehatApplication.php
+++ b/src/Behat/Behat/Console/BehatApplication.php
@@ -108,12 +108,17 @@ class BehatApplication extends Application
$profile = $input->getParameterOption(array('--profile', '-p')) ?: 'default';
$configs = array();
- // check for config file in FS if no provided
+ // if config file is not provided
if (!$configFile) {
+ // then use behat.yml
if (is_file($cwd.DIRECTORY_SEPARATOR.'behat.yml')) {
$configFile = $cwd.DIRECTORY_SEPARATOR.'behat.yml';
+ // or behat.yml.dist
} elseif (is_file($cwd.DIRECTORY_SEPARATOR.'behat.yml.dist')) {
$configFile = $cwd.DIRECTORY_SEPARATOR.'behat.yml.dist';
+ // or config/behat.yml
+ } elseif (is_file($cwd.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'behat.yml')) {
+ $configFile = $cwd.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'behat.yml';
}
}
|
added back support for config/behat.yml
|
Behat_Behat
|
train
|
php
|
77f049b19d976964b344b1a9abe3f107c3c7a5d2
|
diff --git a/salt/version.py b/salt/version.py
index <HASH>..<HASH> 100644
--- a/salt/version.py
+++ b/salt/version.py
@@ -32,4 +32,4 @@ def versions_report():
if __name__ == '__main__':
- print '\n'.join(versions_report())
+ print(__version__)
|
Don't break RPM building.
|
saltstack_salt
|
train
|
py
|
43c9195b846a2b2e4e47186fb7a9e010d54076ae
|
diff --git a/mod/chat/gui_header_js/chatinput.php b/mod/chat/gui_header_js/chatinput.php
index <HASH>..<HASH> 100644
--- a/mod/chat/gui_header_js/chatinput.php
+++ b/mod/chat/gui_header_js/chatinput.php
@@ -5,6 +5,7 @@ require("../lib.php");
require_variable($chat_sid);
optional_variable($groupid);
+optional_variable($chat_pretext, '');
if (!$chatuser = get_record("chat_users", "sid", $chat_sid)) {
echo "Not logged in!";
|
Fix for bug <I>:
One notice in debug mode removed.
|
moodle_moodle
|
train
|
php
|
9d10f3a419398cb094b932bd016b88da3f39ea11
|
diff --git a/core/src/main/java/com/github/phantomthief/util/MoreReflection.java b/core/src/main/java/com/github/phantomthief/util/MoreReflection.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/github/phantomthief/util/MoreReflection.java
+++ b/core/src/main/java/com/github/phantomthief/util/MoreReflection.java
@@ -34,9 +34,10 @@ public class MoreReflection {
if (iterator.hasNext()) {
temp = iterator.next();
}
+ } catch (UnsupportedClassVersionError e) {
+ logger.info("failed to use jdk9's [JEP 259: Stack-Walking API] as caller tracker.");
} catch (Throwable e) {
- logger.warn("failed to use jdk9's [JEP 259: Stack-Walking API] as caller tracker. exception:{}",
- e.toString());
+ logger.warn("failed to use jdk9's [JEP 259: Stack-Walking API] as caller tracker.", e);
}
if (temp == null) {
temp = new StackTraceProviderJdk8();
|
[code healthy] change log to info level.
|
PhantomThief_more-lambdas-java
|
train
|
java
|
00c72ed1c5e9fa06e040b819c831daf45b3327ff
|
diff --git a/WrightTools/_dataset.py b/WrightTools/_dataset.py
index <HASH>..<HASH> 100644
--- a/WrightTools/_dataset.py
+++ b/WrightTools/_dataset.py
@@ -117,9 +117,12 @@ class Dataset(h5py.Dataset):
@property
def _leaf(self):
out = self.natural_name
+ if self.size == 1:
+ out += f" = {self.points}"
if self.units is not None:
out += " ({0})".format(self.units)
- out += " {0}".format(self.shape)
+ if self.size != 1:
+ out += " {0}".format(self.shape)
return out
@property
|
print_tree with values for scalars (#<I>)
|
wright-group_WrightTools
|
train
|
py
|
d3a08505d13b5fb5d1c863d7d4743ccdff84890c
|
diff --git a/Rakefile.rb b/Rakefile.rb
index <HASH>..<HASH> 100644
--- a/Rakefile.rb
+++ b/Rakefile.rb
@@ -34,14 +34,24 @@ rescue LoadError # don't bail out when people do not have roodi installed!
end
end
+use_rcov = true
desc "Run all examples"
begin
+ gem "rcov"
+rescue LoadError
+ warn "rcov not installed...code coverage will not be measured!"
+ sleep 1
+ use_rcov = false
+end
+begin
SPEC_PATTERN ='spec/**/*_spec.rb'
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new() do |t|
t.pattern = SPEC_PATTERN
- t.rcov = true
- t.rcov_opts = ['--exclude', '.*/gems/.*']
+ if use_rcov
+ t.rcov = true
+ t.rcov_opts = ['--exclude', '.*/gems/.*']
+ end
end
rescue LoadError
begin
@@ -51,7 +61,7 @@ rescue LoadError
end
rescue LoadError
task 'spec' do
- puts 'rspec not installed...will not be checked! please install gem install rspec'
+ puts 'rspec not installed...! please install with "gem install rspec"'
end
end
end
|
closes #<I> - gcov in not needed to execute specs
there was a load error when gcov gem was not installed
|
marcmo_cxxproject
|
train
|
rb
|
2fe1d70dbbc48ba826e01353e194eb2bdaecb283
|
diff --git a/edisgo/flex_opt/storage_integration.py b/edisgo/flex_opt/storage_integration.py
index <HASH>..<HASH> 100644
--- a/edisgo/flex_opt/storage_integration.py
+++ b/edisgo/flex_opt/storage_integration.py
@@ -93,21 +93,22 @@ def connect_storage(storage, node):
"""
# add storage itself to graph
- node.grid.graph.add_node(storage, type='storage')
+ storage.grid.graph.add_node(storage, type='storage')
# add 1m connecting line to node the storage is connected to
- if isinstance(node.grid, MVGrid):
+ if isinstance(storage.grid, MVGrid):
voltage_level = 'mv'
else:
voltage_level = 'lv'
- line_type, line_count = select_cable(node.grid.network, voltage_level,
+ # ToDo: nominal_capacity is not quite right here
+ line_type, line_count = select_cable(storage.grid.network, voltage_level,
storage.nominal_capacity)
line = Line(
id=storage.id,
type=line_type,
kind='cable',
length=1e-3,
- grid=node.grid,
+ grid=storage.grid,
quantity=line_count)
- node.grid.graph.add_edge(node, storage, line=line, type='line')
+ storage.grid.graph.add_edge(node, storage, line=line, type='line')
|
Bug fix use grid of storage instead node
|
openego_eDisGo
|
train
|
py
|
53b542d11eeb6277aa75a512502123a2ef112b8b
|
diff --git a/main.go b/main.go
index <HASH>..<HASH> 100644
--- a/main.go
+++ b/main.go
@@ -105,10 +105,17 @@ func main() {
logger.Info("mariadb_ctrl started")
- err = <-process.Wait()
- //TODO: remove pidfile
+ processErr := <-process.Wait()
+
+ err = deletePidFile(config, logger)
if err != nil {
- logger.Fatal("Error starting mariadb_ctrl", err)
+ logger.Error("Error deleting pidfile", err, lager.Data{
+ "pidfile": config.PidFile,
+ })
+ }
+
+ if processErr != nil {
+ logger.Fatal("Error starting mariadb_ctrl", processErr)
}
logger.Info("Process exited without error.")
@@ -118,3 +125,8 @@ func writePidFile(config Config, logger lager.Logger) error {
logger.Info(fmt.Sprintf("Writing pid to %s", config.PidFile))
return ioutil.WriteFile(config.PidFile, []byte(strconv.Itoa(os.Getpid())), 0644)
}
+
+func deletePidFile(config Config, logger lager.Logger) error {
+ logger.Info(fmt.Sprintf("Deleting pidfile: %s", config.PidFile))
+ return os.Remove(config.PidFile)
+}
|
Remove pid file on shutting down the process.
[#<I>]
|
cloudfoundry_mariadb_ctrl
|
train
|
go
|
0341094d2f27c677274828f7bbda3d901a8d4408
|
diff --git a/intranet/apps/events/models.py b/intranet/apps/events/models.py
index <HASH>..<HASH> 100644
--- a/intranet/apps/events/models.py
+++ b/intranet/apps/events/models.py
@@ -162,7 +162,7 @@ class Event(models.Model):
def is_this_year(self):
"""Return whether the event was created after September 1st of this school year."""
now = datetime.now().date()
- ann = self.created_time.date()
+ ann = self.added.date()
if now.month < 9:
return ((ann.year == now.year and ann.month < 9) or (ann.year == now.year - 1 and ann.month >= 9))
else:
|
fix #<I>, events typo
|
tjcsl_ion
|
train
|
py
|
88b7694493d81fe193d151fbb34ec52fabd94b5c
|
diff --git a/src/Interfaces/StandardInterface.php b/src/Interfaces/StandardInterface.php
index <HASH>..<HASH> 100644
--- a/src/Interfaces/StandardInterface.php
+++ b/src/Interfaces/StandardInterface.php
@@ -22,6 +22,11 @@ namespace Benkle\FeedParser\Interfaces;
use Benkle\FeedParser\Parser;
use Benkle\FeedParser\RuleSet;
+/**
+ * Interface StandardInterface
+ * A Standard is a combination of rule set, feed class factory and feed identification.
+ * @package Benkle\FeedParser\Interfaces
+ */
interface StandardInterface
{
/**
@@ -47,4 +52,11 @@ interface StandardInterface
* @return Parser
*/
public function getParser();
+
+ /**
+ * Check if a dom document is a feed this standard handles.
+ * @param \DOMDocument $dom
+ * @return bool
+ */
+ public function canHandle(\DOMDocument $dom);
}
|
Added some comments to StandardInterface and a canHandle method
|
benkle-libs_feed-parser
|
train
|
php
|
4d2f85db89cb1e28b66b04f2755ce42bb5dcb654
|
diff --git a/warrant/tests/tests.py b/warrant/tests/tests.py
index <HASH>..<HASH> 100644
--- a/warrant/tests/tests.py
+++ b/warrant/tests/tests.py
@@ -90,15 +90,16 @@ class CognitoAuthTestCase(unittest.TestCase):
# self.assertEqual(self.user.access_token,None)
@patch('warrant.Cognito', autospec=True)
- def test_register(self,cognito_user):
+ def test_register(self, cognito_user):
u = cognito_user(self.cognito_user_pool_id, self.app_id,
username=self.username)
- res = u.register('sampleuser','sample4#Password',
- given_name='Brian',family_name='Jones',
- name='Brian Jones',
- email='bjones39@capless.io',
- phone_number='+19194894555',gender='Male',
- preferred_username='billyocean')
+ u.add_base_attributes(
+ given_name='Brian', family_name='Jones',
+ name='Brian Jones', email='bjones39@capless.io',
+ phone_number='+19194894555', gender='Male',
+ preferred_username='billyocean')
+ res = u.register('sampleuser', 'sample4#Password')
+
#TODO: Write assumptions
|
Fixed a test, applied a new style of adding attributes
|
capless_warrant
|
train
|
py
|
e62385cd8ae0b7b67dd5db864cde08b8b5050061
|
diff --git a/lib/tty/prompt/keypress.rb b/lib/tty/prompt/keypress.rb
index <HASH>..<HASH> 100644
--- a/lib/tty/prompt/keypress.rb
+++ b/lib/tty/prompt/keypress.rb
@@ -96,7 +96,6 @@ module TTY
else
job.()
end
- rescue Timeout::Error
end
end # Keypress
end # Prompt
|
Change to stop rescuing error as no longer raised
|
piotrmurach_tty-prompt
|
train
|
rb
|
0ceaa742a3a26b4b2be2d2407ab9baa60130adf7
|
diff --git a/src/EchoIt/JsonApi/Handler.php b/src/EchoIt/JsonApi/Handler.php
index <HASH>..<HASH> 100644
--- a/src/EchoIt/JsonApi/Handler.php
+++ b/src/EchoIt/JsonApi/Handler.php
@@ -136,7 +136,7 @@ abstract class Handler
foreach ($value as $obj) {
// Check whether the object is already included in the response on it's ID
- if (in_array ($obj->getKey (), $links->lists ($obj->primaryKey))) continue;
+ if (in_array($obj->getKey (), $links->lists($obj->primaryKey))) continue;
$links->push($obj);
}
|
PSR-2 style fixed on Handler.php
|
egeriis_laravel-jsonapi
|
train
|
php
|
e5b66f5598890ee14eeebeddd7b01a6bcfbadb3d
|
diff --git a/pymbar/mbar.py b/pymbar/mbar.py
index <HASH>..<HASH> 100644
--- a/pymbar/mbar.py
+++ b/pymbar/mbar.py
@@ -1940,6 +1940,8 @@ class MBAR:
# Initialize all f_k to zero.
if f_k_init is None:
f_k_init = np.zeros(len(self.f_k))
+
+ starting_f_k_init = f_k_init.copy()
for index in range(0, np.size(initialization_order) - 1):
k = initialization_order[index]
l = initialization_order[index + 1]
@@ -1959,7 +1961,8 @@ class MBAR:
+ bar(
w_F,
w_R,
- DeltaF=f_k_init[l] - f_k_init[k],
+ method="bisection",
+ DeltaF=starting_f_k_init[l] - starting_f_k_init[k],
relative_tolerance=0.000001,
verbose=False,
compute_uncertainty=False,
|
Improved handling of BAR
For boostrapping, used bisection to be more sure of converging.
|
choderalab_pymbar
|
train
|
py
|
19ba676f174bb9fbefb15c4ce83b39d8ee8195f1
|
diff --git a/packages/ra-data-simple-rest/src/index.js b/packages/ra-data-simple-rest/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/ra-data-simple-rest/src/index.js
+++ b/packages/ra-data-simple-rest/src/index.js
@@ -127,7 +127,7 @@ export default (apiUrl, httpClient = fetchUtils.fetchJson) => {
case CREATE:
return { data: { ...params.data, id: json.id } };
case DELETE_MANY: {
- return { data: json ? json : [] };
+ return { data: json || [] };
}
default:
return { data: json };
|
Update packages/ra-data-simple-rest/src/index.js
|
marmelab_react-admin
|
train
|
js
|
ac21cb086b7455410b417699e7a27a44fb9f37d2
|
diff --git a/providers/facebook/facebook.go b/providers/facebook/facebook.go
index <HASH>..<HASH> 100644
--- a/providers/facebook/facebook.go
+++ b/providers/facebook/facebook.go
@@ -133,11 +133,19 @@ func newConfig(provider *Provider, scopes []string) *oauth2.Config {
AuthURL: authURL,
TokenURL: tokenURL,
},
- Scopes: []string{},
+ Scopes: []string{
+ "email",
+ },
+ }
+
+ defaultScopes := map[string]struct{}{
+ "email": {},
}
for _, scope := range scopes {
- c.Scopes = append(c.Scopes, scope)
+ if _, exists := defaultScopes[scope]; !exists {
+ c.Scopes = append(c.Scopes, scope)
+ }
}
return c
|
Set "email" scope in facebook auth
Fix #<I>
|
markbates_goth
|
train
|
go
|
833d67446f14e88c2888db2c3796568fd00bae7a
|
diff --git a/admin.go b/admin.go
index <HASH>..<HASH> 100644
--- a/admin.go
+++ b/admin.go
@@ -81,7 +81,15 @@ func StartAdmin(initialConfigJSON []byte) error {
}
}
- ln, err := net.Listen("tcp", adminConfig.Listen)
+ // extract a singular listener address
+ netw, listenAddrs, err := ParseNetworkAddress(adminConfig.Listen)
+ if err != nil {
+ return fmt.Errorf("parsing admin listener address: %v", err)
+ }
+ if len(listenAddrs) != 1 {
+ return fmt.Errorf("admin endpoint must have exactly one listener; cannot listen on %v", listenAddrs)
+ }
+ ln, err := net.Listen(netw, listenAddrs[0])
if err != nil {
return err
}
|
admin: Allow listening on unix socket (closes #<I>)
|
mholt_caddy
|
train
|
go
|
9626109f6e1779388b1185605c98441dc53e4c4d
|
diff --git a/lxd/daemon.go b/lxd/daemon.go
index <HASH>..<HASH> 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -1468,20 +1468,16 @@ func (d *Daemon) Ready() error {
return nil
}
-func (d *Daemon) numRunningInstances() (int, error) {
- results, err := instance.LoadNodeAll(d.State(), instancetype.Any)
- if err != nil {
- return 0, err
- }
-
+// numRunningInstances returns the number of running instances.
+func (d *Daemon) numRunningInstances(instances []instance.Instance) int {
count := 0
- for _, instance := range results {
+ for _, instance := range instances {
if instance.IsRunning() {
count = count + 1
}
}
- return count, nil
+ return count
}
// Stop stops the shared daemon.
|
lxd/daemon: Updates numRunningInstances to accept a list of instances to check
|
lxc_lxd
|
train
|
go
|
39a55cb2a92faaa711ec330ecb9fcf48beb5d0a0
|
diff --git a/pyseleniumjs/__init__.py b/pyseleniumjs/__init__.py
index <HASH>..<HASH> 100644
--- a/pyseleniumjs/__init__.py
+++ b/pyseleniumjs/__init__.py
@@ -0,0 +1 @@
+from e2ejs import E2EJS
\ No newline at end of file
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
setup(
name='pyseleniumjs',
description='Small library with javascript utilities for official Python selenium bindings.',
- version='1.0.2b2',
+ version='1.0.2b5',
url='https://github.com/neetVeritas/pyselenium-js',
author='John Nolette',
author_email='john@neetgroup.net',
|
Updated package version, finished pypi export.
|
neetjn_pyselenium-js
|
train
|
py,py
|
936b90b3120fef8bc8e6386ab8a29f4066292ac0
|
diff --git a/paxtools-core/src/main/java/org/biopax/paxtools/controller/Integrator.java b/paxtools-core/src/main/java/org/biopax/paxtools/controller/Integrator.java
index <HASH>..<HASH> 100644
--- a/paxtools-core/src/main/java/org/biopax/paxtools/controller/Integrator.java
+++ b/paxtools-core/src/main/java/org/biopax/paxtools/controller/Integrator.java
@@ -11,7 +11,7 @@ import java.util.*;
/**
*
- * This class is intended to merge and to integrate biopax models
+ * This class is intended to merge and to integrate <em>BioPAX Level2</em> models
* not necessarily from the same resource - if models allow such a
* thing. This class has very similar functionality to the controller.Merger
* but it differs in means of merging/integrating methodology.
|
Comment: the ..controller.Integrator is for BioPAX Level2 models (an is old, needs testing...)
|
BioPAX_Paxtools
|
train
|
java
|
a1b70ec4fd1042b7bc09174bf658faccd2551088
|
diff --git a/eZ/Publish/Core/Repository/UserService.php b/eZ/Publish/Core/Repository/UserService.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/Core/Repository/UserService.php
+++ b/eZ/Publish/Core/Repository/UserService.php
@@ -32,6 +32,7 @@ use eZ\Publish\Core\Repository\Values\User\UserCreateStruct,
eZ\Publish\Core\Base\Exceptions\InvalidArgumentValue,
eZ\Publish\Core\Base\Exceptions\BadStateException,
eZ\Publish\Core\Base\Exceptions\InvalidArgumentException,
+ eZ\Publish\Core\Base\Exceptions\NotFoundException,
ezcMailTools;
@@ -444,6 +445,10 @@ class UserService implements UserServiceInterface
throw new InvalidArgumentValue( "password", $password );
$spiUsers = $this->persistenceHandler->userHandler()->loadByLogin( $login );
+
+ if ( empty( $spiUsers ) )
+ throw new NotFoundException( "user", $login );
+
if ( count( $spiUsers ) > 1 )
{
// something went wrong, we should not have more than one
@@ -459,7 +464,7 @@ class UserService implements UserServiceInterface
);
if ( $spiUsers[0]->passwordHash !== $passwordHash )
- throw new InvalidArgumentValue( "password", $password );
+ throw new NotFoundException( "user", $login );
return $this->buildDomainUserObject( $spiUsers[0] );
}
|
Throw NotFoundException if no users are found and if password is wrong in UserService::loadUserByCredentials
|
ezsystems_ezpublish-kernel
|
train
|
php
|
50f5ba5b0cfdf02cd87a9070676bd3c21c217296
|
diff --git a/ethlog/loggers_test.go b/ethlog/loggers_test.go
index <HASH>..<HASH> 100644
--- a/ethlog/loggers_test.go
+++ b/ethlog/loggers_test.go
@@ -107,11 +107,11 @@ func TestLoggerPrintf(t *testing.T) {
testLogSystem := &TestLogSystem{level: WarnLevel}
AddLogSystem(testLogSystem)
logger.Errorf("error to %v\n", []int{1, 2, 3})
- logger.Warnf("warn")
+ logger.Warnf("warn %%d %d", 5)
logger.Infof("info")
logger.Debugf("debug")
Flush()
- testLogSystem.CheckOutput(t, "[TEST] error to [1 2 3]\n[TEST] warn")
+ testLogSystem.CheckOutput(t, "[TEST] error to [1 2 3]\n[TEST] warn %d 5")
}
func TestMultipleLogSystems(t *testing.T) {
|
ethlog: add test for '%' in log message
This test fails because the log message is formatted twice.
|
ethereum_go-ethereum
|
train
|
go
|
b7cf9b7a445368675d49780f2809f61b1390b260
|
diff --git a/pyamg/util/tests/test_utils.py b/pyamg/util/tests/test_utils.py
index <HASH>..<HASH> 100644
--- a/pyamg/util/tests/test_utils.py
+++ b/pyamg/util/tests/test_utils.py
@@ -1313,13 +1313,13 @@ class TestLevelize(TestCase):
assert_equal(max_coarse, 5)
# test 5
max_levels, max_coarse, result = levelize_strength_or_aggregation(('predefined',{'C' : A}), 5, 5)
- assert_equal(result, [('predefined',{'C' : A})])
+ assert_array_equal(result, [('predefined',{'C' : A})])
assert_equal(max_levels, 2)
assert_equal(max_coarse, 0)
# test 6
max_levels, max_coarse, result = levelize_strength_or_aggregation([('predefined',{'C' : A}), \
('predefined',{'C' : A})], 5, 5)
- assert_equal(result, [('predefined',{'C' : A}), ('predefined',{'C' : A})])
+ assert_array_equal(result, [('predefined',{'C' : A}), ('predefined',{'C' : A})])
assert_equal(max_levels, 3)
assert_equal(max_coarse, 0)
# test 7
|
changed unit test to assert_array_equal for levelize
|
pyamg_pyamg
|
train
|
py
|
c5a6b9e350043ed6da3e02f88eb26120becfbb60
|
diff --git a/lib/spidr/settings/proxy.rb b/lib/spidr/settings/proxy.rb
index <HASH>..<HASH> 100644
--- a/lib/spidr/settings/proxy.rb
+++ b/lib/spidr/settings/proxy.rb
@@ -15,7 +15,7 @@ module Spidr
# The Spidr proxy information.
#
def proxy
- @proxy || Spidr::Proxy.new
+ @proxy ||= Spidr::Proxy.new
end
#
|
Set @proxy to a default proxy to avoid creating too many objects.
|
postmodern_spidr
|
train
|
rb
|
d49f9564242e0d25d32beedcf7448172490b95bf
|
diff --git a/lib/Wave/Http/Response.php b/lib/Wave/Http/Response.php
index <HASH>..<HASH> 100644
--- a/lib/Wave/Http/Response.php
+++ b/lib/Wave/Http/Response.php
@@ -55,12 +55,16 @@ class Response
public function send()
{
+
if (headers_sent()) {
return false;
}
+ // @codeCoverageIgnoreStart
foreach ($this->headers as $header => $status) {
header($header, true, $status);
}
+
}
}
+// @codeCoverageIgnoreEnd
diff --git a/lib/tests/Http/ResponseTest.php b/lib/tests/Http/ResponseTest.php
index <HASH>..<HASH> 100644
--- a/lib/tests/Http/ResponseTest.php
+++ b/lib/tests/Http/ResponseTest.php
@@ -103,6 +103,6 @@ class ResponseTest extends PHPUnit_Framework_TestCase
/*
* This is expected as command line is headerless context
*/
- $this->assertFalse($this->response->send());
+ $this->assertFalse($this->response->send(true));
}
}
\ No newline at end of file
|
Removed second part of the method from coverage reports. Output starts from phpunit.
|
DaGhostman_codewave
|
train
|
php,php
|
33f5119be80d66788b2f079a2507525979319625
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -140,8 +140,27 @@ if (fs.lchmod) wrap(fs, 'lchmod', activator);
if (fs.ftruncate) wrap(fs, 'ftruncate', activator);
// Wrap zlib streams
-var zProto = Object.getPrototypeOf(require('zlib').Deflate.prototype);
-wrap(zProto, "_transform", activator);
+var zlib;
+try { zlib = require('zlib'); } catch (err) { }
+if (zlib && zlib.Deflate && zlib.Deflate.prototype) {
+ var proto = Object.getPrototypeOf(zlib.Deflate.prototype);
+ if (proto._transform) {
+ // streams2
+ wrap(proto, "_transform", activator);
+ }
+ else if (proto.write && proto.flush && proto.end) {
+ // plain ol' streams
+ massWrap(
+ proto,
+ [
+ 'write',
+ 'flush',
+ 'end'
+ ],
+ activator
+ );
+ }
+}
// Wrap Crypto
var crypto;
|
polyfill: extend support for zlib to node <I>.x
zlib in <I>.x is based on streams1, and in <I>.x it uses streams2. Also
note that the monkeypunching done here operates on the Zlib proto in
both cases (i.e. Deflate's prototype's prototype), so it catches all of
the zlib methods. Clever clever creationix!
|
othiym23_async-listener
|
train
|
js
|
701265d3ad943900cb1686f1c13fe9a29cc4e226
|
diff --git a/tests/Fixture/ProductAttributeFixturesTest.php b/tests/Fixture/ProductAttributeFixturesTest.php
index <HASH>..<HASH> 100644
--- a/tests/Fixture/ProductAttributeFixturesTest.php
+++ b/tests/Fixture/ProductAttributeFixturesTest.php
@@ -32,7 +32,7 @@ final class ProductAttributeFixturesTest extends KernelTestCase
$suite = new Suite('test');
$suite->addListener($listenerRegistry->getListener('orm_purger'), ['mode' => 'delete', 'exclude' => [], 'managers' => [null]]);
- $suite->addFixture($fixtureRegistry->getFixture('locale'), ['locales' => ['en_US'], 'load_default_locale' => false]);
+ $suite->addFixture($fixtureRegistry->getFixture('locale'), ['locales' => [], 'load_default_locale' => true]);
$suite->addFixture($fixtureRegistry->getFixture('taxon'), ['custom' => ['books' => ['name' => 'Books', 'code' => 'BOOKS']]]);
$suite->addFixture($fixtureRegistry->getFixture('product_attribute'), ['custom' => [
'book_author' => ['name' => 'Author', 'code' => 'AUTHOR', 'type' => 'text'],
|
Downport changes from <I> to <I>
|
Sylius_Sylius
|
train
|
php
|
51a4adb555cebbc83dc5b9e3df4db70ee1b994f2
|
diff --git a/pkg/model/iam/iam_builder.go b/pkg/model/iam/iam_builder.go
index <HASH>..<HASH> 100644
--- a/pkg/model/iam/iam_builder.go
+++ b/pkg/model/iam/iam_builder.go
@@ -66,6 +66,13 @@ func (b *IAMPolicyBuilder) BuildAWSIAMPolicy() (*IAMPolicy, error) {
// Don't give bastions any permissions (yet)
if b.Role == api.InstanceGroupRoleBastion {
+ p.Statement = append(p.Statement, &IAMStatement{
+ // We grant a trivial (?) permission (DescribeRegions), because empty policies are not allowed
+ Effect: IAMStatementEffectAllow,
+ Action: []string{"ec2:DescribeRegions"},
+ Resource: []string{"*"},
+ })
+
return p, nil
}
|
Create stub IAM policy for bastions
|
kubernetes_kops
|
train
|
go
|
f1ce0f4b9f6a3e5673543bf980fcdb834db20f72
|
diff --git a/volatildap/control.py b/volatildap/control.py
index <HASH>..<HASH> 100644
--- a/volatildap/control.py
+++ b/volatildap/control.py
@@ -25,6 +25,7 @@ class ControlServer(http.server.ThreadingHTTPServer):
def start(self):
if self._thread is not None:
+ # Already started
return
self._thread = threading.Thread(
target=self.serve_forever,
@@ -33,7 +34,10 @@ class ControlServer(http.server.ThreadingHTTPServer):
self._thread.start()
def stop(self):
+ if self._thread is None:
+ return
self.shutdown()
+ self.server_close()
self._thread.join()
self._thread = None
|
Properly stop the control server.
Including cleaning up the resources.
|
rbarrois_volatildap
|
train
|
py
|
Subsets and Splits
Java Commits in Train Set
Queries for all entries where the diff_languages column is 'java', providing a filtered dataset but without deeper analysis.
Java Commits Test Data
Returns a subset of 5000 entries from the dataset where the programming language difference is Java, providing basic filtering for exploration.
Java Commits Sample
Retrieves the first 1,000 records where the 'diff_languages' column is 'java', providing limited insight into the specific data entries.
Java Commits Validation Sample
Retrieves a sample of entries from the validation dataset where the diff languages are Java, providing limited insight into specific Java-related data points.
Java Commits in Validation
This query retrieves a limited sample of entries from the validation dataset where the programming language difference is Java, providing basic filtering with minimal insight.
Java Commits Sample
This query retrieves a sample of 100 records where the 'diff_languages' is 'java', providing basic filtering but limited analytical value.
Java Commits Sample
Retrieves 100 samples where the language difference is Java, providing basic filtering but minimal analytical value.
Java Commits Sample
Retrieves 10 samples where the diff_languages column is 'java', providing basic examples of data entries with this specific language.
Java Commits Validation Sample
Retrieves 1,000 records where the differences in languages are marked as Java, providing a snapshot of that specific subset but limited to raw data.
Java Commits Sample
This query retrieves 1000 random samples from the dataset where the programming language is Java, offering limited insight beyond raw data.