diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/pippo-core/src/main/java/ro/pippo/core/Response.java b/pippo-core/src/main/java/ro/pippo/core/Response.java
index <HASH>..<HASH> 100644
--- a/pippo-core/src/main/java/ro/pippo/core/Response.java
+++ b/pippo-core/src/main/java/ro/pippo/core/Response.java
@@ -1150,6 +1150,28 @@ public final class Response {
}
}
+ /**
+ * This method resets the response.
+ */
+ public void reset() {
+ checkCommitted();
+
+ // reset all headers
+ headers = new HashMap<>();
+ // reset all cookies
+ cookies = new HashMap<>();
+ // reset all locales
+ locals = new HashMap<>();
+ // set status to 0 or INT MAX
+ status = 0;
+
+ try {
+ httpServletResponse.reset();
+ } catch (Exception e) {
+ throw new PippoRuntimeException(e);
+ }
+ }
+
public static Response get() {
RouteContext routeContext = RouteDispatcher.getRouteContext();
|
feat(Response): expose method to reset the response
|
diff --git a/chef/lib/chef/resource.rb b/chef/lib/chef/resource.rb
index <HASH>..<HASH> 100644
--- a/chef/lib/chef/resource.rb
+++ b/chef/lib/chef/resource.rb
@@ -71,8 +71,8 @@ F
end
- FORBIDDEN_IVARS = [:@run_context, :@node, :@not_if, :@only_if]
- HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@node, :@not_if, :@only_if, :@elapsed_time]
+ FORBIDDEN_IVARS = [:@run_context, :@node, :@not_if, :@only_if, :@enclosing_provider]
+ HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@node, :@not_if, :@only_if, :@elapsed_time, :@enclosing_provider]
include Chef::Mixin::CheckHelper
include Chef::Mixin::ParamsValidate
|
avoid puking enclosing_provider and the entire run_context...
|
diff --git a/spec/integration/veritas/self_referential/many_to_many_spec.rb b/spec/integration/veritas/self_referential/many_to_many_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/integration/veritas/self_referential/many_to_many_spec.rb
+++ b/spec/integration/veritas/self_referential/many_to_many_spec.rb
@@ -30,6 +30,8 @@ describe 'Relationship - Self referential Many To Many' do
end
it 'loads all followed people' do
+ pending if RUBY_VERSION < '1.9'
+
people = DM_ENV[person_model].include(:followed_people).to_a
john = people[0]
@@ -41,6 +43,8 @@ describe 'Relationship - Self referential Many To Many' do
end
it 'loads all followers' do
+ pending if RUBY_VERSION < '1.9'
+
people = DM_ENV[person_model].include(:followers).to_a
john = people[0]
|
Remove <I> from travis' allowed failures
|
diff --git a/lib/codemirror.js b/lib/codemirror.js
index <HASH>..<HASH> 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -926,9 +926,9 @@ var CodeMirror = (function() {
function updateCursor() {
var head = sel.inverted ? sel.from : sel.to, lh = textHeight();
var pos = localCoords(head, true);
- var globalY = pos.y + displayOffset * textHeight();
- inputDiv.style.top = Math.max(Math.min(globalY, scroller.offsetHeight), 0) + "px";
- inputDiv.style.left = pos.x + "px";
+ var wrapOff = eltOffset(wrapper), lineOff = eltOffset(lineDiv);
+ inputDiv.style.top = (pos.y + lineOff.top - wrapOff.top) + "px";
+ inputDiv.style.left = (pos.x + lineOff.left - wrapOff.left) + "px";
if (posEq(sel.from, sel.to)) {
cursor.style.top = pos.y + "px";
cursor.style.left = (options.lineWrapping ? Math.min(pos.x, lineSpace.offsetWidth) : pos.x) + "px";
|
Be more precise about hidden input placement
This reduces scrolling artifacts caused by the input being scrolled into
view.
|
diff --git a/src/sap.m/src/sap/m/IconTabHeader.js b/src/sap.m/src/sap/m/IconTabHeader.js
index <HASH>..<HASH> 100644
--- a/src/sap.m/src/sap/m/IconTabHeader.js
+++ b/src/sap.m/src/sap/m/IconTabHeader.js
@@ -343,9 +343,9 @@ sap.ui.define(['jquery.sap.global', './library', 'sap/ui/core/Control', 'sap/ui/
if (oItem.getVisible()) {
//click on already selected item leads to expanding/collapsing of the content (if expandable enabled)
- if (this.oSelectedItem === oItem && !bAPIchange) {
+ if (this.oSelectedItem === oItem) {
//if content is not expandable nothing should happen otherwise content will be expanded/collapsed
- if (bIsParentIconTabBar && oParent.getExpandable()) {
+ if (!bAPIchange && bIsParentIconTabBar && oParent.getExpandable()) {
oParent._toggleExpandCollapse();
}
//click on other item leads to showing the right content of this item
|
[FIX] sap.m.IconTabBar: setSelectedItem method is working correctly now
Change-Id: I1adac0aad<I>d<I>dfa9a2e<I>c<I>bb<I>a<I>
BCP: <I>
|
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index <HASH>..<HASH> 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -114,8 +114,6 @@ module Rails
puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
puts "=> Run `rails server -h` for more startup options"
-
- puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
end
def create_cache_file
|
Delete CTRL-C message as is duplicates Puma
|
diff --git a/resolwe/flow/executors/run.py b/resolwe/flow/executors/run.py
index <HASH>..<HASH> 100644
--- a/resolwe/flow/executors/run.py
+++ b/resolwe/flow/executors/run.py
@@ -248,13 +248,8 @@ class BaseFlowExecutor:
if process_rc > 0:
log_file.close()
json_file.close()
- await self._send_manager_command(
- ExecutorProtocol.FINISH,
- extra_fields={
- ExecutorProtocol.FINISH_PROCESS_RC: process_rc
- },
- )
- return
+
+ return {ExecutorProtocol.FINISH_PROCESS_RC: process_rc}
# Debug output
# Not referenced in Data object
|
Unify return path of executor's run method
|
diff --git a/ModuleBuilderFactory.php b/ModuleBuilderFactory.php
index <HASH>..<HASH> 100644
--- a/ModuleBuilderFactory.php
+++ b/ModuleBuilderFactory.php
@@ -60,7 +60,8 @@ class Factory {
// Create the environment handler and set it on the factory.
$environment_class = '\ModuleBuilder\Environment\\' . $environment_class;
- self::$environment = new $environment_class;
+
+ self::setEnvironment(new $environment_class);
return self::$environment;
}
@@ -68,10 +69,10 @@ class Factory {
/**
* Set the environment object.
*
- * @param $environment
+ * @param \ModuleBuilder\Environment\EnvironmentInterface $environment
* An environment object to set.
*/
- public static function setEnvironment($environment) {
+ public static function setEnvironment(\ModuleBuilder\Environment\EnvironmentInterface $environment) {
self::$environment = new $environment;
}
|
Added interface to method; change wrapper method to call setEnvironment() so interface is checked.
|
diff --git a/release.py b/release.py
index <HASH>..<HASH> 100755
--- a/release.py
+++ b/release.py
@@ -95,6 +95,7 @@ def tag_and_push():
def pypi():
print("--- PYPI ---------------------------------------------------------")
+ system("rm -rf build")
system("python3 setup.py sdist bdist_wheel")
system("twine check dist/*")
system("twine upload --skip-existing --sign dist/*")
|
Work around stale files in wheel (closes #<I>)
|
diff --git a/httprunner/utils.py b/httprunner/utils.py
index <HASH>..<HASH> 100644
--- a/httprunner/utils.py
+++ b/httprunner/utils.py
@@ -597,12 +597,19 @@ def dump_tests(tests_mapping, tag_name):
file_name, file_suffix = os.path.splitext(os.path.basename(test_path))
dump_file_path = os.path.join(dir_path, "{}.{}.json".format(file_name, tag_name))
- tests_to_dump = {
- "project_mapping": {
- key: project_mapping[key] for key in project_mapping if key != "functions"
- },
- "testcases": tests_mapping["testcases"]
- }
+ tests_to_dump = {}
+
+ for key in project_mapping:
+ if key != "functions":
+ tests_to_dump[key] = project_mapping[key]
+ continue
+
+ if project_mapping["functions"]:
+ debugtalk_py_path = os.path.join(dir_path, "debugtalk.py")
+ tests_to_dump["debugtalk.py"] = debugtalk_py_path
+
+ tests_to_dump["testcases"] = tests_mapping["testcases"]
+
with open(dump_file_path, 'w', encoding='utf-8') as outfile:
json.dump(tests_to_dump, outfile, indent=4, separators=(',', ': '))
|
save tests: add debugtalk.py file path
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,7 +1,7 @@
/**
* Pon task to execute commands
* @module pon-task-command
- * @version 1.0.3
+ * @version 1.0.4
*/
'use strict'
|
[ci skip] Travis CI committed after build
|
diff --git a/src/directives/list/table/directive.js b/src/directives/list/table/directive.js
index <HASH>..<HASH> 100644
--- a/src/directives/list/table/directive.js
+++ b/src/directives/list/table/directive.js
@@ -5,9 +5,8 @@ export default () => {
return {
restrict: 'E',
templateUrl: 'monad/src/directives/list/table/template.html',
- scope: {module: '=', items: '=', columns: '='},
+ scope: {module: '=', items: '=', columns: '=', path: '='},
controller,
- controllerAs: 'table',
bindToController: true
};
};
|
nevermind controllerAs for now, it's in an isolate scope anyway
|
diff --git a/client/lib/abtest/active-tests.js b/client/lib/abtest/active-tests.js
index <HASH>..<HASH> 100644
--- a/client/lib/abtest/active-tests.js
+++ b/client/lib/abtest/active-tests.js
@@ -1,7 +1,7 @@
/** @format */
export default {
multiyearSubscriptions: {
- datestamp: '20180417',
+ datestamp: '20180601',
variations: {
show: 50,
hide: 50,
|
[2 year plans] Update the timestamp on multiyearSubscriptions test (#<I>)
|
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index <HASH>..<HASH> 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -79,7 +79,6 @@ class TestCase(unittest.TestCase):
def test_serializer():
for filename in glob.glob('serializer/*.test'):
- if filename.find('core')<0: continue
tests = simplejson.load(file(filename))
for test in tests['tests']:
yield test
|
Remove line that was accidentally committed
--HG--
extra : convert_revision : svn%3Aacbfec<I>-<I>-<I>-a<I>-<I>a<I>e<I>e0/trunk%<I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -46,5 +46,5 @@ setup(
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
],
package_data = {'flat':['templates/*.html','style/*'], 'flat.modes.structureeditor':['templates/*.html'], 'flat.modes.viewer':['templates/*.html'], 'flat.modes.editor':['templates/*.html'], 'flat.modes.metadata':['templates/*.html'] },
- install_requires=['pynlpl >= 1.1.1','Django >= 1.8','requests'] + extradeps
+ install_requires=['pynlpl >= 1.0.7','Django >= 1.8','requests'] + extradeps
)
|
downgrading pynlpl dependency for <I> release
|
diff --git a/src/models/Entity.php b/src/models/Entity.php
index <HASH>..<HASH> 100644
--- a/src/models/Entity.php
+++ b/src/models/Entity.php
@@ -93,10 +93,14 @@ class Entity extends Eloquent {
{
if ($this->hidden[static::ANCESTOR] === null)
{
- $this->hidden[static::ANCESTOR] = $this->buildClosuretableQuery()
+ $closure = $this->buildClosuretableQuery()
->where(static::DEPTH, '=', $this->getDepth())
- ->first()
- ->{static::ANCESTOR};
+ ->first();
+
+ if ($closure !== null)
+ {
+ $this->hidden[static::ANCESTOR] = $closure->{static::ANCESTOR};
+ }
}
return $this->hidden[static::ANCESTOR];
@@ -121,10 +125,14 @@ class Entity extends Eloquent {
{
if ($this->hidden[static::DESCENDANT] === null)
{
- $this->hidden[static::DESCENDANT] = $this->buildClosuretableQuery()
+ $closure = $this->buildClosuretableQuery()
->where(static::DEPTH, '=', $this->getDepth())
- ->first()
- ->{static::DESCENDANT};
+ ->first();
+
+ if ($closure !== null)
+ {
+ $this->hidden[static::DESCENDANT] = $closure->{static::DESCENDANT};
+ }
}
return $this->hidden[static::DESCENDANT];
|
fixed errors while creating new Entity via create() method
|
diff --git a/bonobo/examples/environ.py b/bonobo/examples/environ.py
index <HASH>..<HASH> 100644
--- a/bonobo/examples/environ.py
+++ b/bonobo/examples/environ.py
@@ -1,26 +1,26 @@
+"""
+This transformation extracts the environment and prints it, sorted alphabetically, one item per line.
+
+Used in the bonobo tests around environment management.
+
+"""
import os
import bonobo
def extract_environ():
+ """Yield all the system environment."""
yield from sorted(os.environ.items())
def get_graph():
- """
- This function builds the graph that needs to be executed.
-
- :return: bonobo.Graph
-
- """
graph = bonobo.Graph()
graph.add_chain(extract_environ, print)
return graph
-# The __main__ block actually execute the graph.
if __name__ == '__main__':
parser = bonobo.get_argument_parser()
with bonobo.parse_args(parser):
|
[examples] comments.
|
diff --git a/user/index.php b/user/index.php
index <HASH>..<HASH> 100644
--- a/user/index.php
+++ b/user/index.php
@@ -351,6 +351,8 @@
if (!isset($hiddenfields['lastaccess'])) {
$table->sortable(true, 'lastaccess', SORT_DESC);
+ } else {
+ $table->sortable(true, 'firstname', SORT_ASC);
}
$table->no_sorting('roles');
|
MDL-<I> Course Making user lists sortable when lastacess field is hidden
|
diff --git a/lib/fog/bin/aws.rb b/lib/fog/bin/aws.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/bin/aws.rb
+++ b/lib/fog/bin/aws.rb
@@ -79,6 +79,8 @@ class AWS < Fog::Bin
Fog::AWS::ELB.new
when :emr
Fog::AWS::EMR.new
+ when :glacier
+ Fog::AWS::Glacier.new
when :iam
Fog::AWS::IAM.new
when :rds
|
[AWS] Adding missing :glacier case for AWS.collections
|
diff --git a/lib/onebox/engine/soundcloud_onebox.rb b/lib/onebox/engine/soundcloud_onebox.rb
index <HASH>..<HASH> 100644
--- a/lib/onebox/engine/soundcloud_onebox.rb
+++ b/lib/onebox/engine/soundcloud_onebox.rb
@@ -9,7 +9,7 @@ module Onebox
def to_html
oembed_data = get_oembed_data[:html]
- oembed_data.gsub!('height="400"', 'height="250"') || oembed_data
+ oembed_data.gsub!('visual=true', 'visual=false') || oembed_data
end
def placeholder_html
@@ -18,8 +18,16 @@ module Onebox
private
+ def set?
+ url =~ /\/sets\//
+ end
+
def get_oembed_data
- Onebox::Helpers.symbolize_keys(::MultiJson.load(Onebox::Helpers.fetch_response("https://soundcloud.com/oembed.json?url=#{url}").body))
+ if set?
+ Onebox::Helpers.symbolize_keys(::MultiJson.load(Onebox::Helpers.fetch_response("https://soundcloud.com/oembed.json?url=#{url}").body))
+ else
+ Onebox::Helpers.symbolize_keys(::MultiJson.load(Onebox::Helpers.fetch_response("https://soundcloud.com/oembed.json?url=#{url}&maxheight=166").body))
+ end
end
end
end
|
UX: better SoundCloud onebox
|
diff --git a/modules/custom/activity_creator/src/ActivityFactory.php b/modules/custom/activity_creator/src/ActivityFactory.php
index <HASH>..<HASH> 100644
--- a/modules/custom/activity_creator/src/ActivityFactory.php
+++ b/modules/custom/activity_creator/src/ActivityFactory.php
@@ -124,7 +124,7 @@ class ActivityFactory extends ControllerBase {
$value = $message->getText(NULL);
// Text for aggregated activities.
if (!empty($value[1]) && !empty($arguments)) {
- $text = t($value[1], $arguments);
+ $text = str_replace('@count', $arguments['@count'], $value[1]);
}
// Text for default activities.
else {
|
DS-<I> by ribel: Fix replacing '@count' string in output text for aggregated activities
|
diff --git a/test/fixture/js/index-actual.js b/test/fixture/js/index-actual.js
index <HASH>..<HASH> 100644
--- a/test/fixture/js/index-actual.js
+++ b/test/fixture/js/index-actual.js
@@ -8,4 +8,8 @@ module.exports = function(config){
// But just in case...
// bower:css
// endbower
+ "scripts/app/app.js"
+ ]; // END config.files
+
+ // Mentioning bower inside a comment should have no effect.
};
|
Thought to include a comment that might break...
|
diff --git a/Library/Operators/Comparison/EqualsOperator.php b/Library/Operators/Comparison/EqualsOperator.php
index <HASH>..<HASH> 100644
--- a/Library/Operators/Comparison/EqualsOperator.php
+++ b/Library/Operators/Comparison/EqualsOperator.php
@@ -32,6 +32,8 @@ class EqualsOperator extends ComparisonBaseOperator
protected $_zvalLongOperator = 'ZEPHIR_IS_LONG';
+ protected $_zvalLongNegOperator = 'ZEPHIR_IS_LONG';
+
protected $_zvalStringOperator = 'ZEPHIR_IS_STRING';
protected $_zvalBoolTrueOperator = 'ZEPHIR_IS_TRUE';
diff --git a/Library/Operators/Comparison/IdenticalOperator.php b/Library/Operators/Comparison/IdenticalOperator.php
index <HASH>..<HASH> 100644
--- a/Library/Operators/Comparison/IdenticalOperator.php
+++ b/Library/Operators/Comparison/IdenticalOperator.php
@@ -31,6 +31,8 @@ class IdenticalOperator extends ComparisonBaseOperator
protected $_zvalLongOperator = 'ZEPHIR_IS_LONG';
+ protected $_zvalLongNegOperator = 'ZEPHIR_IS_LONG';
+
protected $_zvalStringOperator = 'ZEPHIR_IS_STRING';
protected $_zvalBoolTrueOperator = 'ZEPHIR_IS_TRUE';
|
Fixing comparison of var(int) with var(dynamic)
|
diff --git a/charge.go b/charge.go
index <HASH>..<HASH> 100644
--- a/charge.go
+++ b/charge.go
@@ -73,7 +73,7 @@ type Charge struct {
Invoice *Invoice `json:"invoice"`
Live bool `json:"livemode"`
Meta map[string]string `json:"metadata"`
- Outcome *Outcome `json:"outcome"`
+ Outcome *ChargeOutcome `json:"outcome"`
Paid bool `json:"paid"`
Refunded bool `json:"refunded"`
Refunds *RefundList `json:"refunds"`
@@ -94,7 +94,7 @@ type FraudDetails struct {
// Outcome is the charge's outcome that details whether a payment
// was accepted and why.
-type Outcome struct {
+type ChargeOutcome struct {
NetworkStatus string `json:"network_status"`
Reason string `json:"reason"`
SellerMessage string `json:"seller_message"`
|
charge: rename top-level Outcome to ChargeOutcome
|
diff --git a/lib/assertions.js b/lib/assertions.js
index <HASH>..<HASH> 100644
--- a/lib/assertions.js
+++ b/lib/assertions.js
@@ -198,9 +198,23 @@ module.exports = function (expect) {
} catch (e) {
if (e._isUnexpected && this.flags.not) {
e.createDiff = function () {
- return expect.diff(subject, subject.replace(new RegExp(args.map(function (arg) {
+ var output = expect.output.clone();
+ var lastIndex = 0;
+ function flushUntilIndex(i) {
+ if (i > lastIndex) {
+ output.text(subject.substring(lastIndex, i));
+ lastIndex = i;
+ }
+ }
+ subject.replace(new RegExp(args.map(function (arg) {
return utils.escapeRegExpMetaChars(String(arg));
- }).join('|'), 'g'), ''));
+ }).join('|'), 'g'), function ($0, index) {
+ flushUntilIndex(index);
+ lastIndex += $0.length;
+ output.text($0, 'red');
+ });
+ flushUntilIndex(subject.length);
+ return {diff: output};
};
}
expect.fail(e);
|
not to contain: Implemented diff for the string case.
|
diff --git a/src/Illuminate/Container/ContextualBindingBuilder.php b/src/Illuminate/Container/ContextualBindingBuilder.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Container/ContextualBindingBuilder.php
+++ b/src/Illuminate/Container/ContextualBindingBuilder.php
@@ -21,6 +21,13 @@ class ContextualBindingBuilder implements ContextualBindingBuilderContract
protected $concrete;
/**
+ * The abstract target.
+ *
+ * @var string
+ */
+ protected $needs;
+
+ /**
* Create a new contextual binding builder.
*
* @param \Illuminate\Container\Container $container
|
Declare undeclared class property.
|
diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadTimeoutException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadTimeoutException.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadTimeoutException.java
+++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadTimeoutException.java
@@ -45,7 +45,8 @@ public class ReadTimeoutException extends QueryConsistencyException {
this(
coordinator,
String.format(
- "Cassandra timeout during read query at consistency %s (%s)",
+ "Cassandra timeout during read query at consistency %s (%s). "
+ + "In case this was generated during read repair, the consistency level is not representative of the actual consistency.",
consistencyLevel, formatDetails(received, blockFor, dataPresent)),
consistencyLevel,
received,
|
Update log message to inform about incorrect CL for read repair (#<I>)
|
diff --git a/lib/ticketmaster/systems/github.rb b/lib/ticketmaster/systems/github.rb
index <HASH>..<HASH> 100644
--- a/lib/ticketmaster/systems/github.rb
+++ b/lib/ticketmaster/systems/github.rb
@@ -41,6 +41,8 @@ module TicketMaster
def self.tickets(project)
repo = Octopi::Repository.find(project.owner, project.name)
+ # @todo: Does it also return an array when there's only one
+ # issue?
issues = []
repo.issues.each do |issue|
issues << TicketMaster::Ticket.new(issue.title, {
|
Added todo for Github::Project#tickets
|
diff --git a/src/function/algebra/decomposition/qr.js b/src/function/algebra/decomposition/qr.js
index <HASH>..<HASH> 100644
--- a/src/function/algebra/decomposition/qr.js
+++ b/src/function/algebra/decomposition/qr.js
@@ -53,7 +53,7 @@ function factory (type, config, load, typed) {
*
* See also:
*
- * lusolve
+ * lup, lusolve
*
* @param {Matrix | Array} A A two dimensional matrix or array
* for which to get the QR decomposition.
|
docs: add link to lup in qr
|
diff --git a/test/TestUtils.js b/test/TestUtils.js
index <HASH>..<HASH> 100644
--- a/test/TestUtils.js
+++ b/test/TestUtils.js
@@ -4,8 +4,9 @@ var _ = require("lodash");
function assertJsonEqual(first, second) {
if (typeof first === "object" && typeof second === "object" && first !== null && second !== null) {
- assert.deepEqual(_.keys(first).sort(), _.keys(second).sort());
- _.each(first, function(key, value) {
+ var keys = _.keys(first).sort();
+ assert.deepEqual(keys, _.keys(second).sort());
+ _.each(keys, function(key) {
assertJsonEqual(first[key], second[key]);
});
} else {
|
Make assertJsonEqual use sorted keys for iteration as well.
|
diff --git a/tests/Fixtures/JsonMocker.php b/tests/Fixtures/JsonMocker.php
index <HASH>..<HASH> 100644
--- a/tests/Fixtures/JsonMocker.php
+++ b/tests/Fixtures/JsonMocker.php
@@ -2,6 +2,8 @@
namespace Bolt\Common\Tests\Fixtures;
+use Bolt\Common\Json;
+
// @codingStandardsIgnoreFile
/**
@@ -46,6 +48,10 @@ class JsonMocker
*/
private static function register()
{
+ if (class_exists(Json::class, false)) {
+ throw new \LogicException(sprintf('%s() must be called before %s is loaded', __METHOD__, Json::class));
+ }
+
$code = <<<'PHP'
namespace Bolt\Common;
|
Added check for JsonMocker just to be sure.
|
diff --git a/lib/sham_rack/http.rb b/lib/sham_rack/http.rb
index <HASH>..<HASH> 100644
--- a/lib/sham_rack/http.rb
+++ b/lib/sham_rack/http.rb
@@ -6,9 +6,6 @@ module ShamRack
attr_accessor :rack_app
- attr_accessor :read_timeout, :open_timeout
- attr_accessor :use_ssl,:key, :cert, :ca_file, :ca_path, :verify_mode, :verify_callback, :verify_depth, :cert_store
-
def start
yield self
end
|
Remove some accessors that are now redundant.
|
diff --git a/holoviews/core/tree.py b/holoviews/core/tree.py
index <HASH>..<HASH> 100644
--- a/holoviews/core/tree.py
+++ b/holoviews/core/tree.py
@@ -1,8 +1,6 @@
from collections import OrderedDict
-from .layer import Grid
-from .layout import GridLayout
-from .view import View, Map
+from .view import View
class AttrTree(object):
@@ -55,24 +53,6 @@ class AttrTree(object):
def fixed(self, val):
self.__dict__['_fixed'] = val
- def grid(self, ordering='alphanumeric'):
- """
- Turn the AttrTree into a GridLayout with the available View
- objects ordering specified by a list of labels or by the
- specified ordering mode ('alphanumeric' or 'insertion').
- """
- if ordering == 'alphanumeric':
- child_ordering = sorted(self.children)
- elif ordering == 'insertion':
- child_ordering = self.children
- else:
- child_ordering = ordering
-
- children = [self.__dict__[l] for l in child_ordering]
- dataview_types = (View, Map, GridLayout, Grid)
- return GridLayout(list(child for child in children
- if isinstance(child, dataview_types)))
-
def update(self, other):
"""
|
Removed AttrTree grid method
|
diff --git a/Kwf/Exception/Abstract.php b/Kwf/Exception/Abstract.php
index <HASH>..<HASH> 100644
--- a/Kwf/Exception/Abstract.php
+++ b/Kwf/Exception/Abstract.php
@@ -184,7 +184,7 @@ abstract class Kwf_Exception_Abstract extends Exception
$data = array(
'error' => array(
'code' => $exception->code,
- 'errorId' => $exception->getLogId(),
+ 'errorId' => $this->getLogId(),
'message' => 'An Error occured. Please try again later',
)
);
@@ -198,7 +198,7 @@ abstract class Kwf_Exception_Abstract extends Exception
$data = array(
'error' => array(
'code' => $exception->code,
- 'errorId' => $exception->getLogId(),
+ 'errorId' => $this->getLogId(),
'message' => $exception->message,
'exception' => array(array(
'message' => $exception->message,
|
Fix logId when exception is not an Kwf_Exception
|
diff --git a/andes/models/governor.py b/andes/models/governor.py
index <HASH>..<HASH> 100644
--- a/andes/models/governor.py
+++ b/andes/models/governor.py
@@ -350,7 +350,9 @@ class IEEEG1Data(TGBaseData):
TGBaseData.__init__(self)
self.K = NumParam(default=20, tex_name='K',
info='Gain (1/R) in mach. base',
- unit='p.u. (power)', power=True, vrange=(5, 30),
+ unit='p.u. (power)',
+ power=True,
+ vrange=(5, 30),
)
self.T1 = NumParam(default=1, tex_name='T_1',
info='Gov. lag time const.',
@@ -470,7 +472,7 @@ class IEEEG1Model(TGBase):
)
# `P0` == `tm0`
- self.vs = Algeb(info='Valve move speed',
+ self.vs = Algeb(info='Valve speed',
tex_name='V_s',
v_str='0',
e_str='(LL_y + tm0 + paux - IAW_y) / T3 - vs',
|
Minor reformatting to IEEEG1
|
diff --git a/apitools/base/py/credentials_lib.py b/apitools/base/py/credentials_lib.py
index <HASH>..<HASH> 100644
--- a/apitools/base/py/credentials_lib.py
+++ b/apitools/base/py/credentials_lib.py
@@ -302,6 +302,9 @@ class GceAssertionCredentials(gce.AppAssertionCredentials):
if (creds['scopes'] in
(None, cached_creds['scopes'])):
scopes = cached_creds['scopes']
+ except: # pylint: disable=bare-except
+ # Treat exceptions as a cache miss.
+ pass
finally:
cache_file.unlock_and_close()
return scopes
@@ -331,6 +334,9 @@ class GceAssertionCredentials(gce.AppAssertionCredentials):
# If it's not locked, the locking process will
# write the same data to the file, so just
# continue.
+ except: # pylint: disable=bare-except
+ # Treat exceptions as a cache miss.
+ pass
finally:
cache_file.unlock_and_close()
|
Treat exceptions accessing GCE credential cache file as a cache miss
This fixes an issue where problems accessing the cache file on
the filesystem (for example, in a container with no mounted
filesystem) would cause apitools to abort entirely, as opposed to
simply not caching the credentials.
Fixes <URL>
|
diff --git a/src/test/caseHolder.js b/src/test/caseHolder.js
index <HASH>..<HASH> 100644
--- a/src/test/caseHolder.js
+++ b/src/test/caseHolder.js
@@ -15,7 +15,10 @@ var gpii = fluid.registerNamespace("gpii");
fluid.registerNamespace("gpii.test.pouch.caseHolder");
-gpii.test.pouch.caseHolder.standardSequenceEnd = [
+// A series of test sequence steps that will clear out any existing data. Designed for use with caseHolders that extend
+// gpii.test.express.caseHolder, which have the ability to wire "start" and "end" sequence steps before and after each
+// test's "body".
+gpii.test.pouch.caseHolder.cleanupSequence = [
{
func: "{testEnvironment}.events.onCleanup.fire",
args: []
@@ -33,5 +36,5 @@ fluid.defaults("gpii.test.pouch.caseHolder.base", {
fluid.defaults("gpii.test.pouch.caseHolder", {
gradeNames: ["gpii.test.pouch.caseHolder.base"],
- sequenceEnd: gpii.test.pouch.caseHolder.standardSequenceEnd
+ sequenceEnd: gpii.test.pouch.caseHolder.cleanupSequence
});
|
GPII-<I>: Renamed standard end sequence steps and added a comment to explain their purpose.
|
diff --git a/src/javascript/core/utils/Mime.js b/src/javascript/core/utils/Mime.js
index <HASH>..<HASH> 100644
--- a/src/javascript/core/utils/Mime.js
+++ b/src/javascript/core/utils/Mime.js
@@ -137,6 +137,14 @@ define("moxie/core/utils/Mime", [
accept.mimes = mimes;
return accept;
+ },
+
+ getFileExtension: function(fileName) {
+ return fileName.replace(/^.+\.([^\.]+)$/, "$1").toLowerCase();
+ },
+
+ getFileMime: function(fileName) {
+ return this.mimes[this.getFileExtension(fileName)] || '';
}
};
|
Mime: Add convenient methods to get file's extension and mime type by it's name.
|
diff --git a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
index <HASH>..<HASH> 100644
--- a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
+++ b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
@@ -189,6 +189,26 @@ public class DefaultChannelPipelineTest {
}
@Test
+ public void testFireChannelRegistered() throws Exception {
+ ChannelPipeline pipeline = new LocalChannel().pipeline();
+ group.register(pipeline.channel());
+ final CountDownLatch latch = new CountDownLatch(1);
+ pipeline.addLast(new ChannelInitializer<Channel>() {
+ @Override
+ protected void initChannel(Channel ch) throws Exception {
+ ch.pipeline().addLast(new ChannelInboundHandlerAdapter() {
+ @Override
+ public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
+ latch.countDown();
+ }
+ });
+ }
+ });
+ pipeline.fireChannelRegistered();
+ assertTrue(latch.await(2, TimeUnit.SECONDS));
+ }
+
+ @Test
public void testPipelineOperation() {
ChannelPipeline pipeline = new LocalChannel().pipeline();
|
Add testcase to show channelRegistered is called
|
diff --git a/lib/excon/response.rb b/lib/excon/response.rb
index <HASH>..<HASH> 100644
--- a/lib/excon/response.rb
+++ b/lib/excon/response.rb
@@ -83,7 +83,10 @@ module Excon
chunk_size -= chunk.bytesize
response_block.call(chunk, nil, nil)
end
- socket.read(2) # 2 == "\r\n".length
+ new_line_size = 2 # 2 == "\r\n".length
+ while new_line_size > 0
+ new_line_size -= socket.read(new_line_size).length
+ end
end
else
while (chunk_size = socket.readline.chomp!.to_i(16)) > 0
@@ -92,7 +95,10 @@ module Excon
chunk_size -= chunk.bytesize
datum[:response][:body] << chunk
end
- socket.read(2) # 2 == "\r\n".length
+ new_line_size = 2 # 2 == "\r\n".length
+ while new_line_size > 0
+ new_line_size -= socket.read(new_line_size).length
+ end
end
end
parse_headers(socket, datum) # merge trailers into headers
|
Make sure we actually get both new line characters
|
diff --git a/salt/grains/core.py b/salt/grains/core.py
index <HASH>..<HASH> 100644
--- a/salt/grains/core.py
+++ b/salt/grains/core.py
@@ -161,7 +161,7 @@ def _linux_gpu_data():
devs = []
try:
- lspci_out = __salt__['cmd.run']('lspci -vmm')
+ lspci_out = __salt__['cmd.run']('{0} -vmm'.format(lspci))
cur_dev = {}
error = False
@@ -495,7 +495,7 @@ def _virtual(osdata):
if not cmd:
continue
- cmd = '{0} {1}'.format(command, ' '.join(args))
+ cmd = '{0} {1}'.format(cmd, ' '.join(args))
try:
ret = __salt__['cmd.run_all'](cmd)
|
Use path found by salt.utils.which
I ran into this problem running `salt-ssh '*' test.ping` with a
XenServer <I> node as the target. Even though the `lspci` and
`dmidecode` (after I installed it) commands are found by
`salt.utils.which`, because they're not actually in the `$PATH`, they
fail to execute.
|
diff --git a/js/binance.js b/js/binance.js
index <HASH>..<HASH> 100644
--- a/js/binance.js
+++ b/js/binance.js
@@ -4959,10 +4959,10 @@ module.exports = class binance extends Exchange {
async fetchBorrowRateHistory (code, since = undefined, limit = undefined, params = {}) {
await this.loadMarkets ();
if (limit === undefined) {
- limit = 93;
- } else if (limit > 93) {
- // Binance API says the limit is 100, but illegal parameter errors are returned when limit is > 93
- throw new BadRequest (this.id + ' fetchBorrowRateHistory limit parameter cannot exceed 93');
+ limit = 92;
+ } else if (limit > 92) {
+ // Binance API says the limit is 100, but "Illegal characters found in a parameter." is returned when limit is > 92
+ throw new BadRequest (this.id + ' fetchBorrowRateHistory limit parameter cannot exceed 92');
}
const currency = this.currency (code);
const request = {
@@ -4970,8 +4970,9 @@ module.exports = class binance extends Exchange {
'limit': limit,
};
if (since !== undefined) {
+ since = since - 1;
request['startTime'] = since;
- const endTime = this.sum (since, limit * 86400000); // required when startTime is further than 93 days in the past
+ const endTime = this.sum (since, limit * 86400000); // required when startTime is further than 92 days in the past
const now = this.milliseconds ();
request['endTime'] = Math.min (endTime, now); // cannot have an endTime later than current time
}
|
fetchBorrowRateHistory subtract 1 from since, limit = <I>
|
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index <HASH>..<HASH> 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -1,11 +1,5 @@
require File.expand_path('../../../../load_paths', __FILE__)
-test = File.expand_path('../..', __FILE__)
-$:.unshift(test) unless $:.include?('test') || $:.include?(test)
-
-lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
require 'config'
require 'test/unit'
|
do not muck with the load path, that is the test task responsibility
|
diff --git a/pkg/model/components/clusterautoscaler.go b/pkg/model/components/clusterautoscaler.go
index <HASH>..<HASH> 100644
--- a/pkg/model/components/clusterautoscaler.go
+++ b/pkg/model/components/clusterautoscaler.go
@@ -43,6 +43,8 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion)
if err == nil {
switch v.Minor {
+ case 24:
+ image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0"
case 23:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0"
case 22:
|
Use Cluster Autoscaler <I> for k8s <I>
We made this explicitly fail before because there is a risk of us forgetting to bump. I think, however, history has shown this risk is not very real
|
diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php
index <HASH>..<HASH> 100644
--- a/lib/dml/moodle_database.php
+++ b/lib/dml/moodle_database.php
@@ -485,9 +485,10 @@ abstract class moodle_database {
$where[] = "$key IS NULL";
} else {
if ($allowed_types & SQL_PARAMS_NAMED) {
- $where[] = "$key = :$key";
- $params[$key] = $value;
- } else {
+ $normkey = trim(preg_replace('/[^a-zA-Z0-9-_]/', '_', $key), '-_'); // Need to normalize key names
+ $where[] = "$key = :$normkey"; // because they can contain, originally,
+ $params[$normkey] = $value; // spaces and other forbiden chars when
+ } else { // using sql_xxx() functions and friends.
$where[] = "$key = ?";
$params[] = $value;
}
|
NOBUG: Normalise generated param names so we can safely use sql_xxx() helper functions everywhere.
|
diff --git a/LiSE/character.py b/LiSE/character.py
index <HASH>..<HASH> 100644
--- a/LiSE/character.py
+++ b/LiSE/character.py
@@ -107,17 +107,17 @@ class CharacterThingMapping(MutableMapping, RuleFollower):
self._cache = {}
self._keycache = {}
if self.engine.caching:
+ self.engine.time_listener(self._recache)
- @self.engine.time_listener
- def recache(branch_then, tick_then, b, t):
- if b not in self._keycache:
- self._keycache[b] = {}
- if branch_then == b and tick_then == t - 1:
- self._keycache[b][t] = self._keycache[b][t-1]
- else:
- self._keycache[b][t] = set(
- self._iter_thing_names()
- )
+ def _recache(self, branch_then, tick_then, b, t):
+ if b not in self._keycache:
+ self._keycache[b] = {}
+ if branch_then == b and tick_then == t - 1:
+ self._keycache[b][t] = self._keycache[b][t-1]
+ else:
+ self._keycache[b][t] = set(
+ self._iter_thing_names()
+ )
def _dispatch_thing(self, k, v):
(b, t) = self.engine.time
|
tweak that seems to make Character friendlier when used in a subprocess
|
diff --git a/src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php
index <HASH>..<HASH> 100644
--- a/src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php
@@ -49,7 +49,10 @@ final class Configuration implements ConfigurationInterface
->children()
->scalarNode('driver')->defaultValue(SyliusResourceBundle::DRIVER_DOCTRINE_ORM)->end()
->booleanNode('prepend_doctrine_migrations')->defaultTrue()->end()
- ->booleanNode('process_shipments_before_recalculating_prices')->defaultFalse()->end()
+ ->booleanNode('process_shipments_before_recalculating_prices')
+ ->setDeprecated('sylius/sylius', '1.10', 'The "%path%.%node%" parameter is deprecated and will be removed in 2.0.')
+ ->defaultFalse()
+ ->end()
->end()
;
|
[Core][Shipping] Deprecate processing shipments before recalculating prices
|
diff --git a/nupic/research/monitor_mixin/trace.py b/nupic/research/monitor_mixin/trace.py
index <HASH>..<HASH> 100644
--- a/nupic/research/monitor_mixin/trace.py
+++ b/nupic/research/monitor_mixin/trace.py
@@ -99,7 +99,7 @@ class IndicesTrace(Trace):
@staticmethod
def prettyPrintDatum(datum):
- return str(list(datum))
+ return str(sorted(list(datum)))
|
Sort the indices while pretty-printing a trace
|
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java
index <HASH>..<HASH> 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java
@@ -73,7 +73,7 @@ import org.slf4j.LoggerFactory;
* parquet.dictionary.page.size=1048576 # in bytes, default = 1 * 1024 * 1024
*
* # The compression algorithm used to compress pages
- * parquet.compression=UNCOMPRESSED # one of: UNCOMPRESSED, SNAPPY, GZIP, LZO. Default: UNCOMPRESSED. Supersedes mapred.output.compress*
+ * parquet.compression=UNCOMPRESSED # one of: UNCOMPRESSED, SNAPPY, GZIP, LZO, ZSTD. Default: UNCOMPRESSED. Supersedes mapred.output.compress*
*
* # The write support class to convert the records written to the OutputFormat into the events accepted by the record consumer
* # Usually provided by a specific ParquetOutputFormat subclass
|
PARQUET-<I>: Add zstd to `parquet.compression` description of ParquetOutputFormat Javadoc (#<I>)
The current Javadoc doesn't mention zstd.
<URL>
|
diff --git a/src/sap.ui.rta/test/sap/ui/rta/qunit/util/adaptationStarter.qunit.js b/src/sap.ui.rta/test/sap/ui/rta/qunit/util/adaptationStarter.qunit.js
index <HASH>..<HASH> 100644
--- a/src/sap.ui.rta/test/sap/ui/rta/qunit/util/adaptationStarter.qunit.js
+++ b/src/sap.ui.rta/test/sap/ui/rta/qunit/util/adaptationStarter.qunit.js
@@ -54,6 +54,10 @@ sap.ui.define([
oResourceBundle.getText("TIT_ADAPTATION_STARTER_MIXED_CHANGES_TITLE"),
"then the title of the mixed changes message is shown correctly"
);
+ /**
+ * TODO: This test should be integrated again after the automatic translations have refreshed the messagebundle
+ * the translations have not implemented the new link syntax yet because of that the test is failing
+ *
assert.strictEqual(
this.fnMessageBoxStub.lastCall.args[0].mAggregations.content.map(function(item, index) {
if (index === 1) {
@@ -63,7 +67,7 @@ sap.ui.define([
}).join(""),
oResourceBundle.getText("MSG_ADAPTATION_STARTER_MIXED_CHANGES_WARNING"),
"then the text of the mixed changes message is shown correctly"
- );
+ );*/
}.bind(this));
});
|
[INTERNAL][Fix] sap.ui.rta: Failing Qunit Test in adaptationStarter
- commenting out the failing quint test until the automatic translations has updated the messagebundle with the new link syntax
Change-Id: I3a<I>e<I>bc6c<I>f<I>c6b2b2dd0c<I>fea5
|
diff --git a/test/rfc_test.rb b/test/rfc_test.rb
index <HASH>..<HASH> 100644
--- a/test/rfc_test.rb
+++ b/test/rfc_test.rb
@@ -269,4 +269,17 @@ describe "RFC Recurrence Rules" do # http://www.kanzaki.com/docs/ical/rrule.html
dates.must_pair_with expected_dates
dates.size.must_equal expected_dates.size
end
+
+ it "monthly on the 2nd and 15th of the month for 10 occurrences" do
+ schedule = new_schedule(every: :month, day: [2, 15], total: 10)
+
+ expected_dates = cherry_pick(
+ 2015 => { 9 => [2, 15], 10 => [2, 15], 11 => [2, 15], 12 => [2, 15] },
+ 2016 => { 1 => [2, 15] }).map { |t| t + 12.hours }
+
+ dates = schedule.events.to_a
+
+ dates.must_pair_with expected_dates
+ dates.size.must_equal expected_dates.size
+ end
end
|
Test for monthly 2nd and <I>th for <I> occurrences
|
diff --git a/dsdev_utils/paths.py b/dsdev_utils/paths.py
index <HASH>..<HASH> 100644
--- a/dsdev_utils/paths.py
+++ b/dsdev_utils/paths.py
@@ -78,7 +78,7 @@ def remove_any(path):
class ChDir(object):
def __init__(self, path):
- if six.PY2 or sys.version_info[1] == 5:
+ if six.PY2 or sys.version_info[1] in [4, 5]:
path = str(path)
self.old_dir = os.getcwd()
|
reg path for python <I> and <I>
|
diff --git a/inc/i18n.php b/inc/i18n.php
index <HASH>..<HASH> 100644
--- a/inc/i18n.php
+++ b/inc/i18n.php
@@ -10,6 +10,11 @@
namespace Inpsyde\Validator;
+// Exit early in case multiple Composer autoloaders try to include this file.
+if ( function_exists( __NAMESPACE__ . '\\' . 'load_translations' ) ) {
+ return;
+}
+
/**
* @param string $path
*
|
Return early if the `load_translations()` function has already been declared.
Resolves #5
|
diff --git a/src/console.js b/src/console.js
index <HASH>..<HASH> 100644
--- a/src/console.js
+++ b/src/console.js
@@ -2,8 +2,6 @@
const huey = require('huey')
-const {stdout} = process
-
// Equals true if the console is mocked.
let mocking = false
@@ -61,11 +59,15 @@ function performCalls() {
args[j] = JSON.stringify(arg)
}
}
- if (key == 'warn') {
- args.unshift(huey.yellow('warn:'))
- } else if (key == 'error') {
- args.unshift(huey.red('error:'))
+ if (typeof process != 'undefined') {
+ if (key == 'warn') {
+ args.unshift(huey.yellow('warn:'))
+ } else if (key == 'error') {
+ args.unshift(huey.red('error:'))
+ }
+ process.stdout.write('\n' + args.join(' '))
+ } else {
+ console[key](args.join(' '))
}
- stdout.write('\n' + args.join(' '))
}
}
|
fix: don't assume process.stdout exists
|
diff --git a/lib/target.js b/lib/target.js
index <HASH>..<HASH> 100644
--- a/lib/target.js
+++ b/lib/target.js
@@ -296,7 +296,7 @@ class Target {
bootstrap: this.bootstrap,
boilerplate: this.boilerplate,
includeHeader: this.modular,
- includeHelpers: this.modular,
+ includeHelpers: !this.hasParent && this.modular,
watching
};
|
fix include of helpers for child targets; closes #<I>
|
diff --git a/addon/models/preprint-provider.js b/addon/models/preprint-provider.js
index <HASH>..<HASH> 100644
--- a/addon/models/preprint-provider.js
+++ b/addon/models/preprint-provider.js
@@ -12,6 +12,7 @@ export default OsfModel.extend({
footerLinks: DS.attr('string'),
allowSubmissions: DS.attr('boolean'),
additionalProviders: DS.attr(),
+ shareSource: DS.attr('string'),
// Relationships
taxonomies: DS.hasMany('taxonomy'),
preprints: DS.hasMany('preprint', { inverse: 'provider', async: true }),
|
Add shareSource property to preprint-provider model
|
diff --git a/simpleldap/__init__.py b/simpleldap/__init__.py
index <HASH>..<HASH> 100644
--- a/simpleldap/__init__.py
+++ b/simpleldap/__init__.py
@@ -99,20 +99,23 @@ class Connection(object):
# this to a class of their liking.
result_item_class = LDAPItem
- def __init__(self, hostname, port=None, dn='', password='',
+ def __init__(self, hostname='localhost', port=None, dn='', password='',
encryption=None, require_cert=None, debug=False,
initialize_kwargs=None, options=None):
"""
Bind to hostname:port using the passed distinguished name (DN), as
``dn``, and password.
+ If ``hostname`` is not given, default to ``'localhost'``.
+
If no user and password is given, try to connect anonymously with a
blank DN and password.
``encryption`` should be one of ``'tls'``, ``'ssl'``, or ``None``.
If ``'tls'``, then the standard port 389 is used by default and after
binding, tls is started. If ``'ssl'``, then port 636 is used by
- default.
+ default. ``port`` can optionally be given for connecting to a
+ non-default port.
``require_cert`` is None by default. Set this to ``True`` or
``False`` to set the ``OPT_X_TLS_REQUIRE_CERT`` ldap option.
|
Default hostname argument to 'localhost'. Thanks to Adriano Ribeiro (drr<I>t) for the suggestion.
|
diff --git a/lib/fgraph.rb b/lib/fgraph.rb
index <HASH>..<HASH> 100644
--- a/lib/fgraph.rb
+++ b/lib/fgraph.rb
@@ -391,7 +391,7 @@ module FGraph
#
def get_id(id)
return unless id
- id = id['id'] if id.is_a?(Hash)
+ id = id['id'] || id[:id] if id.is_a?(Hash)
id
end
end
|
Accept symbol as well. (Corresponding to usage in readme file.)
|
diff --git a/routingtable/routingtable.go b/routingtable/routingtable.go
index <HASH>..<HASH> 100644
--- a/routingtable/routingtable.go
+++ b/routingtable/routingtable.go
@@ -599,6 +599,10 @@ func (table *routingTable) messages(routesDiff routesDiff, endpointDiff endpoint
}
func (table *routingTable) RemoveRoutes(desiredLRP *models.DesiredLRPSchedulingInfo) (TCPRouteMappings, MessagesToEmit) {
+ logger := table.logger.Session("RemoveRoutes", lager.Data{"desired_lrp": DesiredLRPData(desiredLRP)})
+ logger.Debug("starting")
+ defer logger.Debug("completed")
+
return table.SetRoutes(desiredLRP, nil)
}
|
Put back the RemoveRoutes logging to make the test happy
|
diff --git a/src/renderer/canvas.js b/src/renderer/canvas.js
index <HASH>..<HASH> 100644
--- a/src/renderer/canvas.js
+++ b/src/renderer/canvas.js
@@ -9,7 +9,7 @@ var CanvasRenderer = function(el, options) {
el.appendChild(canvas);
- if (typeof(G_vmlCanvasManager) == 'object') {
+ if (typeof(G_vmlCanvasManager) === 'object') {
G_vmlCanvasManager.initElement(canvas);
}
|
Replace `==` by `===`
|
diff --git a/lib/colocated-babel-plugin.js b/lib/colocated-babel-plugin.js
index <HASH>..<HASH> 100644
--- a/lib/colocated-babel-plugin.js
+++ b/lib/colocated-babel-plugin.js
@@ -24,7 +24,7 @@ module.exports = function (babel) {
ExportDefaultDeclaration(path, state) {
let defaultExportDeclarationPath = path.get('declaration');
let defaultExportIsExpressionOrClass =
- defaultExportDeclarationPath.isClass() || defaultExportDeclarationPath.isExpression();
+ defaultExportDeclarationPath.isClass() || defaultExportDeclarationPath.isExpression() || defaultExportDeclarationPath.isFunction();
if (
state.colocatedTemplateFound !== true ||
|
Update lib/colocated-babel-plugin.js
|
diff --git a/lib/doorkeeper/oauth/authorization_code_request.rb b/lib/doorkeeper/oauth/authorization_code_request.rb
index <HASH>..<HASH> 100644
--- a/lib/doorkeeper/oauth/authorization_code_request.rb
+++ b/lib/doorkeeper/oauth/authorization_code_request.rb
@@ -2,7 +2,6 @@ module Doorkeeper
module OAuth
class AuthorizationCodeRequest
include Doorkeeper::Validations
- include Doorkeeper::OAuth::Helpers
validate :attributes, error: :invalid_request
validate :client, error: :invalid_client
|
Doorkeeper::OAuth::Helpers is no longer necessary for find_or_create.
|
diff --git a/client/v3/client_test.go b/client/v3/client_test.go
index <HASH>..<HASH> 100644
--- a/client/v3/client_test.go
+++ b/client/v3/client_test.go
@@ -80,7 +80,7 @@ func TestDialCancel(t *testing.T) {
}
func TestDialTimeout(t *testing.T) {
- defer testutil.AfterTest(t)
+ testutil.BeforeTest(t)
wantError := context.DeadlineExceeded
diff --git a/tests/integration/v3_alarm_test.go b/tests/integration/v3_alarm_test.go
index <HASH>..<HASH> 100644
--- a/tests/integration/v3_alarm_test.go
+++ b/tests/integration/v3_alarm_test.go
@@ -35,7 +35,7 @@ import (
// TestV3StorageQuotaApply tests the V3 server respects quotas during apply
func TestV3StorageQuotaApply(t *testing.T) {
- testutil.AfterTest(t)
+ testutil.BeforeTest(t)
quotasize := int64(16 * os.Getpagesize())
clus := NewClusterV3(t, &ClusterConfig{Size: 2})
|
Fix 2 remaining 'defer AfterTest' calls.
|
diff --git a/src/Orders/OrdersAWBInfo.php b/src/Orders/OrdersAWBInfo.php
index <HASH>..<HASH> 100644
--- a/src/Orders/OrdersAWBInfo.php
+++ b/src/Orders/OrdersAWBInfo.php
@@ -17,7 +17,7 @@ class OrdersAWBInfo {
* @return \Psr\Http\Message\ResponseInterface
* @throws \Exception
*/
- public function setAwbInfo($cmd, $courier, $plic = null, $packages = null, $kg = null){
+ public function setAwbInfo($cmd, $courier, $plic = null, $packages = null, $kg = null, $sambata = 0){
// Sanity check
if(!isset($cmd) || !is_int($cmd)) throw new \Exception('Specificati comanda');
if(!isset($courier) || trim($courier) == '') throw new \Exception('Specificati curierul');
@@ -41,6 +41,7 @@ class OrdersAWBInfo {
$data['packages'] = $packages;
$data['kg'] = $kg;
}
+ $data['sambata'] = $sambata;
// Send request and retrieve response
$result = Dispatcher::send($method, $action, $data);
|
Added parameter for Saturday delivery
modified: src/Orders/OrdersAWBInfo.php
|
diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php
index <HASH>..<HASH> 100644
--- a/mod/workshop/renderer.php
+++ b/mod/workshop/renderer.php
@@ -237,7 +237,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
$type = mimeinfo_from_type("type", $type);
$image = html_writer::empty_tag('img', array('src'=>$this->output->pix_url(file_mimetype_icon($type)), 'alt'=>$type, 'class'=>'icon'));
- $linkhtml = html_writer::link($fileurl, $image) . html_writer::link($fileurl, $filename);
+ $linkhtml = html_writer::link($fileurl, $image) . substr($filepath, 1) . html_writer::link($fileurl, $filename);
$linktxt = "$filename [$fileurl]";
if ($format == "html") {
|
NOBUG: Workshop submission attachments are displayed with the path, not just filename
|
diff --git a/src/module-elasticsuite-core/view/frontend/web/js/form-mini.js b/src/module-elasticsuite-core/view/frontend/web/js/form-mini.js
index <HASH>..<HASH> 100644
--- a/src/module-elasticsuite-core/view/frontend/web/js/form-mini.js
+++ b/src/module-elasticsuite-core/view/frontend/web/js/form-mini.js
@@ -5,7 +5,7 @@ define([
'underscore',
'mage/template',
'Magento_Catalog/js/price-utils',
- 'Magento_Ui/js/lib/ko/template/loader',
+ 'Magento_Ui/js/lib/knockout/template/loader',
'jquery/ui',
'mage/translate',
'mageQuickSearch'
|
Repair broken autocomplete - Knockout JS libs path have changed in Magento <I>-rc*
|
diff --git a/packages/ember-metal/lib/get_properties.js b/packages/ember-metal/lib/get_properties.js
index <HASH>..<HASH> 100644
--- a/packages/ember-metal/lib/get_properties.js
+++ b/packages/ember-metal/lib/get_properties.js
@@ -18,9 +18,10 @@ import { typeOf } from "ember-metal/utils";
```
@method getProperties
- @param obj
+ @for Ember
+ @param {Object} obj
@param {String...|Array} list of keys to get
- @return {Hash}
+ @return {Object}
*/
export default function getProperties(obj) {
var ret = {};
|
[DOC beta] Fix the namespace of the Ember.getProperties method.
Previously it was incorrectly being rendered on the
Ember.InjectedProperty page.
|
diff --git a/src/Browser.php b/src/Browser.php
index <HASH>..<HASH> 100644
--- a/src/Browser.php
+++ b/src/Browser.php
@@ -519,6 +519,20 @@ class Browser
}
/**
+ * Execute a Closure outside of the current browser scope when the selector is available.
+ *
+ * @param string $selector
+ * @param \Closure $callback
+ * @return $this
+ */
+ public function elsewhereWhenAvailable($selector, Closure $callback)
+ {
+ return $this->elsewhere('', function ($browser) use ($selector, $callback) {
+ $this->whenAvailable($selector, $callback);
+ });
+ }
+
+ /**
* Set the current component state.
*
* @param \Laravel\Dusk\Component $component
|
[6.x] Add Browser::elsewhereWhenAvailable(). (#<I>)
|
diff --git a/src/test/java/io/ddavison/conductor/FrameworkTest.java b/src/test/java/io/ddavison/conductor/FrameworkTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/io/ddavison/conductor/FrameworkTest.java
+++ b/src/test/java/io/ddavison/conductor/FrameworkTest.java
@@ -27,7 +27,8 @@ public class FrameworkTest extends Locomotive {
@Test
public void testSetAndValidateText() throws Exception {
- setAndValidateText("#setTextField", "set and validate text test");
+ setAndValidateText("#setTextField", "set and validate text test")
+ .validateText("#setTextField", "set and validate text test");
}
@Test
|
Add .validateText(...) in unit test as suggested.
|
diff --git a/lib/jubilee/version.rb b/lib/jubilee/version.rb
index <HASH>..<HASH> 100644
--- a/lib/jubilee/version.rb
+++ b/lib/jubilee/version.rb
@@ -3,7 +3,7 @@ module Jubilee
MAJOR = 2
MINOR = 1
PATCH = 0
- BUILD = "Alpha1"
+ BUILD = "beta"
STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
end
|
bump to <I>.beta
|
diff --git a/examples/gen_ooaofooa_schema.py b/examples/gen_ooaofooa_schema.py
index <HASH>..<HASH> 100644
--- a/examples/gen_ooaofooa_schema.py
+++ b/examples/gen_ooaofooa_schema.py
@@ -45,12 +45,14 @@ def main():
m = loader.build_metamodel()
c = loader.build_component(derived_attributes=True)
-
+
for o_obj in m.select_many('O_OBJ'):
for o_attr in many(o_obj).O_ATTR[102](o_attr_filter):
logger.info('Filtering %s.%s' % (o_obj.Key_Lett, o_attr.Name))
metaclass = c.find_metaclass(o_obj.Key_Lett)
metaclass.delete_attribute(o_attr.Name)
+ if o_obj.Key_Lett == 'ACT_ACT':
+ metaclass.insert_attribute(index=5, name='return_value', type_name='INTEGER')
xtuml.persist_schema(c, '/dev/stdout')
|
job: #<I> Automating the re-insertion of return_type into ACT_ACT which is of an unsupported special type (instance) and coercing it to INTEGER.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -384,6 +384,7 @@ function onCaptcha (options, response, body) {
// Prioritize the explicit fallback siteKey over other matches
if (match[0].indexOf('fallback') !== -1) {
keys.unshift(match[1]);
+ if (!debugging) break;
} else {
keys.push(match[1]);
}
|
Bail sooner when not debugging
|
diff --git a/example/rakefile.rb b/example/rakefile.rb
index <HASH>..<HASH> 100644
--- a/example/rakefile.rb
+++ b/example/rakefile.rb
@@ -1,13 +1,21 @@
+desc 'clean all examples'
+task :clean_all do
+ run_rakefiles("rake clean")
+end
+
desc 'build all examples'
task :all_examples do
+ run_rakefiles("rake")
+end
+
+task :default => :all_examples
+
+def run_rakefiles(c)
Dir.glob('**/Rakefile.rb').each do |p|
dir = File.dirname(p)
cd dir do
- puts "running rake in #{dir}"
- sh "rake"
+ sh "#{c}"
end
end
end
-
-task :default => :all_examples
|
easy way to execute all example rake tasks and clean up again
|
diff --git a/utils/data-plotter/LeapDataPlotter.js b/utils/data-plotter/LeapDataPlotter.js
index <HASH>..<HASH> 100644
--- a/utils/data-plotter/LeapDataPlotter.js
+++ b/utils/data-plotter/LeapDataPlotter.js
@@ -85,6 +85,8 @@
LeapDataPlotter.prototype.plot = function (id, data, opts) {
console.assert(data, "No plotting data received");
+ opts || (opts = {});
+
if (data.length) {
for (var i = 0, c = 120; i < data.length; i++, c=++c>122?97:c) {
|
Fix issue where not giving options to #plot would crash
|
diff --git a/command/meta.go b/command/meta.go
index <HASH>..<HASH> 100644
--- a/command/meta.go
+++ b/command/meta.go
@@ -96,7 +96,7 @@ func (m *Meta) Client() (*api.Client, error) {
}
}
// If we need custom TLS configuration, then set it
- if m.flagCACert != "" || m.flagCAPath != "" || m.flagInsecure {
+ if m.flagCACert != "" || m.flagCAPath != "" || m.flagClientCert != "" || m.flagClientKey != "" || m.flagInsecure {
var certPool *x509.CertPool
var err error
if m.flagCACert != "" {
|
command: Fixing setup of client certificates
|
diff --git a/src/Comparator.php b/src/Comparator.php
index <HASH>..<HASH> 100644
--- a/src/Comparator.php
+++ b/src/Comparator.php
@@ -45,7 +45,9 @@ class Comparator
}, $definedApi->getAllClasses());
foreach ($definedApiClassNames as $apiClassName) {
- $changelog = $this->examineClass($changelog, $oldApi->reflect($apiClassName), $newApi);
+ /** @var ReflectionClass $oldClass */
+ $oldClass = $newApi->reflect($apiClassName);
+ $changelog = $this->examineClass($changelog, $oldClass, $newApi);
}
return $changelog;
|
Documented `$oldClass` type, since otherwise PHPStan chokes on it
|
diff --git a/mapchete/io_utils.py b/mapchete/io_utils.py
index <HASH>..<HASH> 100644
--- a/mapchete/io_utils.py
+++ b/mapchete/io_utils.py
@@ -4,13 +4,11 @@ import numpy as np
import mapchete
from tilematrix import *
-from rasterio.warp import RESAMPLING
def read_vector(
process,
input_file,
- pixelbuffer=0,
- resampling=RESAMPLING.nearest
+ pixelbuffer=0
):
"""
This is a wrapper around the read_vector_window function of tilematrix.
@@ -35,7 +33,7 @@ def read_raster(
process,
input_file,
pixelbuffer=0,
- resampling=RESAMPLING.nearest
+ resampling="nearest"
):
"""
This is a wrapper around the read_raster_window function of tilematrix.
@@ -58,6 +56,7 @@ def read_raster(
return metadata, data
+
def write_raster(
process,
metadata,
|
making resampling method configurable
|
diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index <HASH>..<HASH> 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -230,7 +230,7 @@ module Vagrant
end
# Store the ID locally
- @id = value.to_s
+ @id = value.nil? ? nil : value.to_s
# Notify the provider that the ID changed in case it needs to do
# any accounting from it.
|
Do not to_s the machine id if it is nil
When destroying a machine, the machine id is set to nil, the to_s causes it to be set to empty string. This can cause inconsistent behavior in anything (such as plugins) that tests the machine id.
|
diff --git a/question/format.php b/question/format.php
index <HASH>..<HASH> 100644
--- a/question/format.php
+++ b/question/format.php
@@ -539,7 +539,10 @@ class qformat_default {
if (is_readable($filename)) {
$filearray = file($filename);
- /// Check for Macintosh OS line returns (ie file on one line), and fix
+ // If the first line of the file starts with a UTF-8 BOM, remove it.
+ $filearray[0] = textlib::trim_utf8_bom($filearray[0]);
+
+ // Check for Macintosh OS line returns (ie file on one line), and fix.
if (preg_match("~\r~", $filearray[0]) AND !preg_match("~\n~", $filearray[0])) {
return explode("\r", $filearray[0]);
} else {
|
MDL-<I> question import: strip UTF8 BOM
Previously, if there was a byte-order mark at the start of the file, the
import would just break, which was silly. Much better to just strip it
off.
|
diff --git a/errors.go b/errors.go
index <HASH>..<HASH> 100644
--- a/errors.go
+++ b/errors.go
@@ -1,12 +1,40 @@
package plugins
-import (
- "errors"
+type Error int
+
+func (e Error) Error() string {
+ if s, ok := errors[e]; ok {
+ return s
+ }
+
+ if e < 100 {
+ return "Unknown transmission error"
+ } else if e < 200 {
+ return "Unknown server error"
+ } else if e < 300 {
+ return "Unknown client error"
+ } else {
+ return "Unknown error"
+ }
+}
+
+var errors = map[Error]string{
+ Success: "No error. Everything is fine.",
+ NoSupportedFormat: "No supported formats in common",
+ Unblocking: "This is a unblocking recieve",
+ NotImplemented: "Operation is not implemented",
+ NotDirectory: "Path supplied is not a directory",
+}
+
+//Transmission errors
+const (
+ Success Error = iota
+ NoSupportedFormat
)
-var (
- NoSupportedFormat = errors.New("No supported formats in common")
- Unblocking = errors.New("This is a unblocking recieve")
- NotImplemented = errors.New("Operation is not implemented")
- NotDirectory = errors.New("Path supplied is not a directory")
+//Server errors
+const (
+ Unblocking Error = 100 + iota
+ NotImplemented
+ NotDirectory
)
|
Remade how errors is represented in preparation for sending them over the wire.
|
diff --git a/palladium/tests/test_util.py b/palladium/tests/test_util.py
index <HASH>..<HASH> 100644
--- a/palladium/tests/test_util.py
+++ b/palladium/tests/test_util.py
@@ -315,9 +315,11 @@ class TestProcessStore:
def test_mtime_setitem(self, store):
dt0 = datetime.now()
store['somekey'] = '1'
+ sleep(0.001) # make sure that we're not too fast
dt1 = datetime.now()
assert dt0 < store.mtime['somekey'] < dt1
store['somekey'] = '2'
+ sleep(0.001) # make sure that we're not too fast
dt2 = datetime.now()
assert dt1 < store.mtime['somekey'] < dt2
|
Test for mtime of ProcessStore is somtimes too fast, added sleep.
|
diff --git a/daemon_unix.go b/daemon_unix.go
index <HASH>..<HASH> 100644
--- a/daemon_unix.go
+++ b/daemon_unix.go
@@ -68,6 +68,13 @@ func (d *Context) search() (daemon *os.Process, err error) {
return
}
daemon, err = os.FindProcess(pid)
+ if err == nil && daemon != nil {
+ // Send a test signal to test if this daemon is actually alive or dead
+ // An error means it is dead
+ if daemon.Signal(syscall.Signal(0)) != nil {
+ daemon = nil
+ }
+ }
}
return
}
|
Fix search. Now it will only return a daemon pointer if it is live
|
diff --git a/libre/apps/data_drivers/exceptions.py b/libre/apps/data_drivers/exceptions.py
index <HASH>..<HASH> 100644
--- a/libre/apps/data_drivers/exceptions.py
+++ b/libre/apps/data_drivers/exceptions.py
@@ -1,2 +1,5 @@
-class Http400(Exception):
+from rest_framework.exceptions import ParseError
+
+
+class Http400(ParseError):
pass
|
Subclass rest framework ParseError and use it to drive LIBRE's Http<I> until it is renamed to LIBREParseError
|
diff --git a/src/Controller/Component/AuthorizationComponent.php b/src/Controller/Component/AuthorizationComponent.php
index <HASH>..<HASH> 100644
--- a/src/Controller/Component/AuthorizationComponent.php
+++ b/src/Controller/Component/AuthorizationComponent.php
@@ -69,7 +69,14 @@ class AuthorizationComponent extends Component
return;
}
- throw new ForbiddenException([$action, is_object($resource) ? get_class($resource) : (is_string($resource) ? $resource : gettype($resource))]);
+ if (is_object($resource)) {
+ $name = get_class($resource);
+ } else if (is_string($resource)) {
+ $name = $resource;
+ } else {
+ $name = gettype($resource);
+ }
+ throw new ForbiddenException([$action, $name]);
}
/**
|
Split nested ternary operator into if else
|
diff --git a/plugins/providers/virtualbox/action.rb b/plugins/providers/virtualbox/action.rb
index <HASH>..<HASH> 100644
--- a/plugins/providers/virtualbox/action.rb
+++ b/plugins/providers/virtualbox/action.rb
@@ -88,7 +88,6 @@ module VagrantPlugins
b2.use Call, DestroyConfirm do |env2, b3|
if env2[:result]
- b3.use ConfigValidate
b3.use CheckAccessible
b3.use EnvSet, :force_halt => true
b3.use action_halt
|
providers/virtualbox: don't require valid config on destroy [GH-<I>]
|
diff --git a/test/constants.js b/test/constants.js
index <HASH>..<HASH> 100644
--- a/test/constants.js
+++ b/test/constants.js
@@ -38,6 +38,7 @@ describe("constants", function () {
// Must be one of these
assert(-1 !== [
gpf.hosts.browser,
+ gpf.hosts.nashorn,
gpf.hosts.nodejs,
gpf.hosts.phantomjs,
gpf.hosts.rhino,
|
Nashorn support (#<I>)
|
diff --git a/lib/thumbsniper/shared/Target.php b/lib/thumbsniper/shared/Target.php
index <HASH>..<HASH> 100644
--- a/lib/thumbsniper/shared/Target.php
+++ b/lib/thumbsniper/shared/Target.php
@@ -48,6 +48,9 @@ class Target
private $tsLastRequested;
/** @var int */
+ private $tsLastFailed;
+
+ /** @var int */
private $tsCheckedOut;
/** @var int */
@@ -278,6 +281,22 @@ class Target
/**
* @return int
*/
+ public function getTsLastFailed()
+ {
+ return $this->tsLastFailed;
+ }
+
+ /**
+ * @param int $tsLastFailed
+ */
+ public function setTsLastFailed($tsLastFailed)
+ {
+ $this->tsLastFailed = $tsLastFailed;
+ }
+
+ /**
+ * @return int
+ */
public function getTsCheckedOut()
{
return $this->tsCheckedOut;
|
add tsLastFailed field
|
diff --git a/webapps/webapp/src/test/js/e2e/ci.conf.js b/webapps/webapp/src/test/js/e2e/ci.conf.js
index <HASH>..<HASH> 100644
--- a/webapps/webapp/src/test/js/e2e/ci.conf.js
+++ b/webapps/webapp/src/test/js/e2e/ci.conf.js
@@ -39,7 +39,7 @@ exports.config = {
'tasklist/specs/filter-spec.js',
'tasklist/specs/process-start-spec.js',
'tasklist/specs/tasklist-sorting-spec.js'
- 'tasklist/specs/tasklist-search-spec.js',
+ 'tasklist/specs/tasklist-search-spec.js'
],
// A base URL for your application under test. Calls to protractor.get()
|
fix(e2e): remove wasted comma in ci.conf
|
diff --git a/aioftp/__main__.py b/aioftp/__main__.py
index <HASH>..<HASH> 100644
--- a/aioftp/__main__.py
+++ b/aioftp/__main__.py
@@ -58,7 +58,7 @@ family = {
async def main():
server = aioftp.Server([user], path_io_factory=path_io_factory)
- await server.run()
+ await server.run(args.host, args.port, family=family)
with contextlib.suppress(KeyboardInterrupt):
|
server: add missed host, port and family args
|
diff --git a/LeanMapper/Reflection/PropertyFactory.php b/LeanMapper/Reflection/PropertyFactory.php
index <HASH>..<HASH> 100644
--- a/LeanMapper/Reflection/PropertyFactory.php
+++ b/LeanMapper/Reflection/PropertyFactory.php
@@ -68,6 +68,9 @@ class PropertyFactory
$propertyType = new PropertyType($matches[2], $aliases);
$isWritable = $annotationType === 'property';
$containsCollection = $matches[3] !== '';
+ if ($propertyType->isBasicType() and $containsCollection) {
+ throw new InvalidAnnotationException("Invalid property type definition given: @$annotationType $annotation in entity {$entityReflection->getName()}. Lean Mapper doesn't support <type>[] notation for basic types.");
+ }
$isNullable = ($matches[1] !== '' or $matches[4] !== '');
$name = substr($matches[5], 1);
|
Improved error message when [] notation is used with basic type in @property annotation
|
diff --git a/py/h2o_glm.py b/py/h2o_glm.py
index <HASH>..<HASH> 100644
--- a/py/h2o_glm.py
+++ b/py/h2o_glm.py
@@ -17,12 +17,17 @@ def pickRandGlmParams(paramDict, params):
maxCase = max(paramDict['case'])
minCase = min(paramDict['case'])
# make sure the combo of case and case_mode makes sense
+ # there needs to be some entries in both effective cases
if ('case_mode' in params):
if ('case' not in params) or (params['case'] is None):
params['case'] = 1
- if params['case_mode']=="<" and params['case']==minCase:
+ elif params['case_mode']=="<" and params['case']==minCase:
params['case'] += 1
- if params['case_mode']==">" and params['case']==maxCase:
+ elif params['case_mode']==">" and params['case']==maxCase:
+ params['case'] -= 1
+ elif params['case_mode']==">=" and params['case']==minCase:
+ params['case'] += 1
+ elif params['case_mode']=="<=" and params['case']==maxCase:
params['case'] -= 1
return colX
|
eliminate more case/case_num combos that result in only one value of effective output
|
diff --git a/tests/SensioLabs/Connect/Tests/Api/Entity/AbstractEntityTest.php b/tests/SensioLabs/Connect/Tests/Api/Entity/AbstractEntityTest.php
index <HASH>..<HASH> 100644
--- a/tests/SensioLabs/Connect/Tests/Api/Entity/AbstractEntityTest.php
+++ b/tests/SensioLabs/Connect/Tests/Api/Entity/AbstractEntityTest.php
@@ -39,6 +39,20 @@ class AbstractEntityTest extends \PHPUnit_Framework_TestCase
$this->assertSame($api, $this->entity->get('clone')->getApi());
}
+ public function testApiIsNotSerialized()
+ {
+ $api = $this->getMockBuilder('SensioLabs\Connect\Api\Api')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->entity->setApi($api);
+
+ $unserializedEntity = unserialize(serialize($this->entity));
+
+ $this->assertInstanceOf(get_class($this->entity), $unserializedEntity);
+ $this->assertNull($unserializedEntity->getApi());
+ }
+
public function testHas()
{
$this->assertFalse($this->entity->has('foobar'));
|
Added tests for entities serialization (related to #<I>)
|
diff --git a/sprd/view/svg/BendingTextConfigurationUploadRendererClass.js b/sprd/view/svg/BendingTextConfigurationUploadRendererClass.js
index <HASH>..<HASH> 100644
--- a/sprd/view/svg/BendingTextConfigurationUploadRendererClass.js
+++ b/sprd/view/svg/BendingTextConfigurationUploadRendererClass.js
@@ -4,7 +4,7 @@ define(['js/svg/Svg'], function(Svg) {
defaults: {
configuration: null,
- width: "{width()}mm"
+ width: "{widthInMM()}mm"
},
ctor: function() {
|
Fix uploading bending text to designer service. Renamed width partly.
|
diff --git a/src/Controller/DashboardPluginsController.php b/src/Controller/DashboardPluginsController.php
index <HASH>..<HASH> 100644
--- a/src/Controller/DashboardPluginsController.php
+++ b/src/Controller/DashboardPluginsController.php
@@ -155,7 +155,7 @@ class DashboardPluginsController extends MelisAbstractActionController
{
// return plugin view
$request = $this->getRequest();
- $pluginConfigPost = get_object_vars($request->getPost());
+ $pluginConfigPost = $request->getPost()->toArray();
/**
* decode the string
|
get_object_vars on post fixed
|
diff --git a/src/helpers.php b/src/helpers.php
index <HASH>..<HASH> 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -12,7 +12,7 @@ if (! function_exists('assetic')) {
{
try {
return elixir($file);
- } catch (InvalidArgumentException $e) {
+ } catch (Exception $e) {
return $file;
}
}
|
assetic() method should handle both InvalidArgumentException and
ErrorException.
|
diff --git a/ciscosparkapi/api/memberships.py b/ciscosparkapi/api/memberships.py
index <HASH>..<HASH> 100644
--- a/ciscosparkapi/api/memberships.py
+++ b/ciscosparkapi/api/memberships.py
@@ -251,11 +251,13 @@ class MembershipsAPI(object):
return Membership(json_data)
def update(self, membershipId, isModerator=None, **request_parameters):
- """Updates properties for a membership, by ID.
+ """Update properties for a membership, by ID.
Args:
membershipId(basestring): The membership ID.
isModerator(bool): Set to True to make the person a room moderator.
+ **request_parameters: Additional request parameters (provides
+ support for parameters that may be added in the future).
Returns:
Membership: A Membership object with the updated Spark membership
@@ -276,7 +278,7 @@ class MembershipsAPI(object):
# API request
json_data = self._session.put('memberships/' + membershipId,
- json=put_data)
+ json=put_data)
# Return a Membership object created from the response JSON data
return Membership(json_data)
|
Update indentation and docstrings
|
diff --git a/src/server/pfs/server/server_test.go b/src/server/pfs/server/server_test.go
index <HASH>..<HASH> 100644
--- a/src/server/pfs/server/server_test.go
+++ b/src/server/pfs/server/server_test.go
@@ -1231,7 +1231,10 @@ func TestFlush(t *testing.T) {
}()
// Flush ACommit
- commitInfos, err := client.FlushCommit(
+ commitInfos, err := client.FlushCommit([]*pfsclient.Commit{pclient.NewCommit("A", ACommit.ID)}, nil)
+ require.NoError(t, err)
+ require.Equal(t, 3, len(commitInfos))
+ commitInfos, err = client.FlushCommit(
[]*pfsclient.Commit{pclient.NewCommit("A", ACommit.ID)},
[]*pfsclient.Repo{pclient.NewRepo("C")},
)
|
Extend test for Flush a bit.
|
diff --git a/notify.go b/notify.go
index <HASH>..<HASH> 100644
--- a/notify.go
+++ b/notify.go
@@ -7,11 +7,9 @@ type notifier interface {
Stop(chan<- EventInfo)
}
-func newNotifier(w watcher, c <-chan EventInfo) notifier {
+func newNotifier(w watcher, c chan EventInfo) notifier {
if rw, ok := w.(recursiveWatcher); ok {
- // return NewRecursiveTree(rw, c)
- _ = rw // TODO
- return newTree(w, c)
+ return newRecursiveTree(rw, c)
}
return newTree(w, c)
}
|
use recursiveTree by default for recursive wathers
closes #6
|
diff --git a/bugwarrior/db.py b/bugwarrior/db.py
index <HASH>..<HASH> 100644
--- a/bugwarrior/db.py
+++ b/bugwarrior/db.py
@@ -227,7 +227,6 @@ def merge_left(field, local_task, remote_issue, hamming=False):
# If a remote does not appear in local, add it to the local task
new_count = 0
for remote in remote_field:
- found = False
for local in local_field:
if (
# For annotations, they don't have to match *exactly*.
@@ -240,9 +239,8 @@ def merge_left(field, local_task, remote_issue, hamming=False):
remote == local
)
):
- found = True
break
- if not found:
+ else:
log.debug("%s not found in %r" % (remote, local_field))
local_task[field].append(remote)
new_count += 1
|
Don't re-implement for/else control flow.
|
diff --git a/reactor-core/src/main/java/reactor/core/publisher/Operators.java b/reactor-core/src/main/java/reactor/core/publisher/Operators.java
index <HASH>..<HASH> 100644
--- a/reactor-core/src/main/java/reactor/core/publisher/Operators.java
+++ b/reactor-core/src/main/java/reactor/core/publisher/Operators.java
@@ -786,14 +786,12 @@ public abstract class Operators {
@SuppressWarnings("unchecked")
public static <T> CorePublisher<T> onLastAssembly(CorePublisher<T> source) {
Function<Publisher, Publisher> hook = Hooks.onLastOperatorHook;
- final Publisher<T> publisher;
if (hook == null) {
- publisher = source;
- }
- else {
- publisher = Objects.requireNonNull(hook.apply(source),"LastOperator hook returned null");
+ return source;
}
+ Publisher<T> publisher = Objects.requireNonNull(hook.apply(source),"LastOperator hook returned null");
+
if (publisher instanceof CorePublisher) {
return (CorePublisher<T>) publisher;
}
|
Avoid `instanceof` check in `onLastAssembly` if the hook is null (#<I>)
Since if the hook is null we're not changing the publisher,
we can return it "as is" without any additional check and avoid the instanceof check.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.