diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/bin/runImportViaApi.php b/bin/runImportViaApi.php
index <HASH>..<HASH> 100755
--- a/bin/runImportViaApi.php
+++ b/bin/runImportViaApi.php
@@ -88,7 +88,7 @@ array_map(function ($contentFileName) {
'context' => ['website' => 'ru', 'locale' => 'de_DE']
]);
- $blockId = preg_replace('/.*\/|\.html$/im', '', $contentFileName);
+ $blockId = preg_replace('/.*\/|\.html$/i', '', $contentFileName);
$contentBlockImportRequest = HttpRequest::fromParameters(
HttpRequest::METHOD_PUT,
HttpUrl::fromString('http://example.com/api/content_blocks/' . $blockId),
|
Issue #<I>: Remove another obsolete pattern modifier
|
diff --git a/jenkins-plugin/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/PipelineGraphPublisher.java b/jenkins-plugin/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/PipelineGraphPublisher.java
index <HASH>..<HASH> 100644
--- a/jenkins-plugin/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/PipelineGraphPublisher.java
+++ b/jenkins-plugin/src/main/java/org/jenkinsci/plugins/pipeline/maven/publishers/PipelineGraphPublisher.java
@@ -246,7 +246,10 @@ public class PipelineGraphPublisher extends MavenPublisher {
return getClass().getName() + "[" +
"disabled=" + isDisabled() + ", " +
"scopes=" + getIncludedScopes() + ", " +
- "versions={snapshot:" + isIncludeSnapshotVersions() + ", release:" + isIncludeReleaseVersions() + "}" +
+ "versions={snapshot:" + isIncludeSnapshotVersions() + ", release:" + isIncludeReleaseVersions() + "}, " +
+ "skipDownstreamTriggers=" + isSkipDownstreamTriggers() + ", " +
+ "lifecycleThreshold=" + getLifecycleThreshold() + ", " +
+ "ignoreUpstreamTriggers=" + isIgnoreUpstreamTriggers() +
']';
}
|
Fix toString of PipelineGraphPublisher
|
diff --git a/core-bundle/src/Resources/contao/forms/FormTextField.php b/core-bundle/src/Resources/contao/forms/FormTextField.php
index <HASH>..<HASH> 100644
--- a/core-bundle/src/Resources/contao/forms/FormTextField.php
+++ b/core-bundle/src/Resources/contao/forms/FormTextField.php
@@ -136,6 +136,12 @@ class FormTextField extends \Widget
{
case 'digit':
$strType = 'number';
+
+ // Allow floats (see #7257)
+ if (!isset($this->arrAttributes['step']))
+ {
+ $this->addAttribute('step', 'any');
+ }
break;
case 'phone':
|
[Core] Allow floating point numbers in "number" input fields (see #<I>)
|
diff --git a/test/runner.js b/test/runner.js
index <HASH>..<HASH> 100644
--- a/test/runner.js
+++ b/test/runner.js
@@ -6,7 +6,7 @@ var mochaBin = join(__dirname, '..', 'node_modules', '.bin', 'mocha');
var walker = walk.walk(__dirname + '/spec', {followLinks: false});
walker.on('file', function(root, stat, next) {
var filepath = root + '/' + stat.name;
- cp.spawn(mochaBin, [filepath], {stdio: 'inherit'});
+ cp.spawnSync(mochaBin, [filepath], {stdio: 'inherit'});
next();
});
|
Mak mocha runner sync in order to preserve DB consistency during tests.
|
diff --git a/grace/task.py b/grace/task.py
index <HASH>..<HASH> 100644
--- a/grace/task.py
+++ b/grace/task.py
@@ -8,7 +8,7 @@ from update import Update
from upload import Upload
from lint import Lint
import os
-from error import UnknownCommandError, NoExectuableError
+from error import UnknownCommandError, NoExectuableError, FolderNotFoundError
import sys
import time
from watchdog.observers import Observer
@@ -188,6 +188,14 @@ class Task(object):
self.exec_upload()
if self._test:
+ if not os.path.exists(os.path.join(os.getcwd(), 'test')):
+ print 'No tests to build found.'
+ return
+ else:
+ if not os.path.exists(os.path.join(os.getcwd(), 'test', 'tests')):
+ print 'No tests to build found.'
+ return
+
if self._test_cases is None:
self._test_cases = self._config['test_cases']
|
Bugfix
* fixed error when trying to run manage.py test without any tests available
|
diff --git a/test/apiProfileTest.js b/test/apiProfileTest.js
index <HASH>..<HASH> 100644
--- a/test/apiProfileTest.js
+++ b/test/apiProfileTest.js
@@ -9,8 +9,10 @@ describe("h5.profile", function () {
var h5 = new HaloAPI(process.env.HALOAPI_KEY);
var promise;
- // leniant 10 second timemout
- this.timeout(10000);
+ // very leniant 30 second timemout
+ // shouldn't be required, but if rate limiting is a factor
+ // requests may take some time to be accepted
+ this.timeout(30000);
describe(".spartanImage(player: string)", function () {
var player = "Frankie";
|
Increase timeout for profile endpoints
|
diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/hudson/PluginWrapper.java
+++ b/core/src/main/java/hudson/PluginWrapper.java
@@ -54,6 +54,7 @@ import org.kohsuke.stapler.interceptor.RequirePOST;
import java.util.Enumeration;
import java.util.jar.JarFile;
+import java.util.logging.Level;
/**
* Represents a Jenkins plug-in and associated control information
@@ -372,7 +373,7 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
* Terminates the plugin.
*/
public void stop() {
- LOGGER.info("Stopping "+shortName);
+ LOGGER.log(Level.FINE, "Stopping {0}", shortName);
try {
getPlugin().stop();
} catch(Throwable t) {
|
Reducing message from stop() to FINE.
Normally this is only printed during functional tests or during in-process restart.
In neither case do we really want to see a log message (i.e. two lines of text) for each plugin in the system being stopped.
|
diff --git a/msrest/serialization.py b/msrest/serialization.py
index <HASH>..<HASH> 100644
--- a/msrest/serialization.py
+++ b/msrest/serialization.py
@@ -129,9 +129,11 @@ class Model(object):
Remove the polymorphic key from the initial data.
"""
for subtype_key in cls.__dict__.get('_subtype_map', {}).keys():
- response_key = _decode_attribute_map_key(cls._attribute_map[subtype_key]['key'])
- if response_key in response:
- subtype_value = response.pop(response_key)
+ subtype_value = None
+
+ rest_api_response_key = _decode_attribute_map_key(cls._attribute_map[subtype_key]['key'])
+ subtype_value = response.pop(rest_api_response_key, None) or response.pop(subtype_key, None)
+ if subtype_value:
flatten_mapping_type = cls._flatten_subtype(subtype_key, objects)
return objects[flatten_mapping_type[subtype_value]]
return cls
|
Fix serialisation from dict with escape
|
diff --git a/pages/Login/components/ForgotPassword/style.js b/pages/Login/components/ForgotPassword/style.js
index <HASH>..<HASH> 100644
--- a/pages/Login/components/ForgotPassword/style.js
+++ b/pages/Login/components/ForgotPassword/style.js
@@ -9,7 +9,9 @@ import { css } from 'glamor';
import colors from 'Styles/colors';
export default css({
+ color: colors.shade6,
+ position: 'relative',
display: 'inline-block',
width: 'auto',
- color: colors.shade6,
+ zIndex: '1',
}).toString();
|
CON-<I> - fixed z-index for a password reminder link since it has negative margin top and is overlapped by a sibling
|
diff --git a/tests/MSSQLDatabaseQueryTest.php b/tests/MSSQLDatabaseQueryTest.php
index <HASH>..<HASH> 100644
--- a/tests/MSSQLDatabaseQueryTest.php
+++ b/tests/MSSQLDatabaseQueryTest.php
@@ -9,7 +9,7 @@ class MSSQLDatabaseQueryTest extends SapphireTest {
public function testDateValueFormatting() {
$obj = $this->objFromFixture('MSSQLDatabaseQueryTestDataObject', 'test-data-1');
- $this->assertEquals('2012-01-01', $obj->TestDate, 'Date field value is formatted correctly (Y-m-d)');
+ $this->assertEquals('2012-01-01', date('Y-m-d', strtotime($obj->TestDate)), 'Date field value is formatted correctly (Y-m-d)');
}
public function testDatetimeValueFormatting() {
|
Ensure date test is Y-m-d
|
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -102,7 +102,7 @@ class PropertyNormalizer extends AbstractObjectNormalizer
do {
foreach ($reflectionObject->getProperties() as $property) {
- if (!$this->isAllowedAttribute($reflectionObject->getName(), $property->name)) {
+ if (!$this->isAllowedAttribute($reflectionObject->getName(), $property->name, $format, $context)) {
continue;
}
|
property normalizer should also pass format and context to isAllowedAttribute
|
diff --git a/Test/Generator/GeneratorTest.php b/Test/Generator/GeneratorTest.php
index <HASH>..<HASH> 100644
--- a/Test/Generator/GeneratorTest.php
+++ b/Test/Generator/GeneratorTest.php
@@ -13,7 +13,9 @@ abstract class GeneratorTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
$this->setUpTemporalDirectory();
- define('DRUPAL_ROOT', getcwd());
+ if (!defined('DRUPAL_ROOT')) {
+ define('DRUPAL_ROOT', getcwd());
+ }
}
public function setUpTemporalDirectory()
|
Ask if DRUPAL_ROOT defined and define
|
diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
index <HASH>..<HASH> 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
@@ -183,7 +183,7 @@ public abstract class WebSocketServerHandshaker {
p.replace(ctx.name(), "wsdecoder", newWebsocketDecoder());
encoderName = p.context(HttpResponseEncoder.class).name();
- p.addAfter(encoderName, "wsencoder", newWebSocketEncoder());
+ p.addBefore(encoderName, "wsencoder", newWebSocketEncoder());
}
channel.writeAndFlush(response).addListener(new ChannelFutureListener() {
@Override
|
[#<I>] Correctly add the wsencoder before the httpencoder as the httpencoder also handle ByteBuf
|
diff --git a/core/src/main/java/io/atomix/core/impl/CorePrimitiveRegistry.java b/core/src/main/java/io/atomix/core/impl/CorePrimitiveRegistry.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/io/atomix/core/impl/CorePrimitiveRegistry.java
+++ b/core/src/main/java/io/atomix/core/impl/CorePrimitiveRegistry.java
@@ -122,11 +122,11 @@ public class CorePrimitiveRegistry implements ManagedPrimitiveRegistry {
"primitives",
ConsistentMapType.instance(),
partitionService.getSystemPartitionGroup());
- return new ConsistentMapProxy(proxy, this)
- .connect()
- .thenApply(map -> {
+ return proxy.connect()
+ .thenApply(v -> {
+ ConsistentMapProxy mapProxy = new ConsistentMapProxy(proxy, this);
primitives = new TranscodingAsyncConsistentMap<>(
- map,
+ mapProxy,
key -> key,
key -> key,
value -> value != null ? SERIALIZER.encode(value) : null,
|
Ensure primitive registry is started prior to creating any distributed primitives.
|
diff --git a/lib/puppet/face/man.rb b/lib/puppet/face/man.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/face/man.rb
+++ b/lib/puppet/face/man.rb
@@ -59,7 +59,13 @@ Puppet::Face.define(:man, '0.0.1') do
# OK, if we have Ronn on the path we can delegate to it and override the
# normal output process. Otherwise delegate to a pager on the raw text,
# otherwise we finally just delegate to our parent. Oh, well.
- ENV['LESS'] ||= 'FRSX' # emulate git...
+
+ # These are the same options for less that git normally uses.
+ # -R : Pass through color control codes (allows display of colors)
+ # -X : Don't init/deinit terminal (leave display on screen on exit)
+ # -F : automatically exit if display fits entirely on one screen
+ # -S : don't wrap long lines
+ ENV['LESS'] ||= 'FRSX'
ronn = Puppet::Util.which('ronn')
pager = [ENV['MANPAGER'], ENV['PAGER'], 'less', 'most', 'more'].
|
(Maint) Clarify what the options to less are
The comment for an assignment to the LESS environment variable didn't
provide any insight into what was being done. This expands on the
comment so that the reader can know a bit better what all of "random"
letters mean.
|
diff --git a/goopt.go b/goopt.go
index <HASH>..<HASH> 100644
--- a/goopt.go
+++ b/goopt.go
@@ -11,6 +11,7 @@ import (
"path"
"tabwriter"
"strings"
+ "container/vector"
)
var opts = make([]opt, 0, 100)
@@ -253,11 +254,11 @@ func String(names []string, d string, help string) *string {
// argname string The argument name of the strings that are appended (e.g. the val in --opt=val)
// help string The help text (automatically Expand()ed) to display for this flag
// Returns:
-// []string This points to a string slice whose value is appended as this flag is changed
-func Strings(names []string, d string, help string) []string {
- s := make([]string,0,100)
+// *vector.StringVector This points to a string vector whose value is appended as this flag is changed
+func Strings(names []string, d string, help string) *vector.StringVector {
+ s := new(vector.StringVector)
f := func(ss string) os.Error {
- s = Append(s, ss)
+ s.Push(ss)
return nil
}
ReqArg(names, d, help, f)
|
Changed String to be a vector.StringVector, because slice resizing doesn't affect the returned slice
|
diff --git a/webbrowser.go b/webbrowser.go
index <HASH>..<HASH> 100644
--- a/webbrowser.go
+++ b/webbrowser.go
@@ -98,13 +98,13 @@ func Open(s string) error {
// No display, no need to open a browser. Lynx users **MAY** have
// something to say about this.
if os.Getenv("DISPLAY") == "" {
- return errors.New(fmt.Printf("Tried to open %q on default webbrowser, no screen found.\n", url))
+ return fmt.Errorf("Tried to open %q on default webbrowser, no screen found.\n", url))
}
fallthrough
case "darwin":
// Check SSH env vars.
if os.Getenv("SSH_CLIENT") != "" || os.Getenv("SSH_TTY") != "" {
- return errors.New(fmt.Printf("Tried to open %q on default webbrowser, but you are running a shell session.\n", url))
+ return fmt.Errorf("Tried to open %q on default webbrowser, but you are running a shell session.\n", url))
}
}
|
fmt.Errorf is a real thing!
|
diff --git a/tests/AllTests.php b/tests/AllTests.php
index <HASH>..<HASH> 100755
--- a/tests/AllTests.php
+++ b/tests/AllTests.php
@@ -57,6 +57,7 @@ class AllTests
$suite = new PHPUnit_Framework_TestSuite();
$suite->setName('SimplePie');
+ $suite->addTestSuite('CacheTest');
$suite->addTestSuite('EncodingTest');
$suite->addTestSuite('IRITest');
$suite->addTestSuite('LocatorTest');
|
Add CacheTest to AllTests
|
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java
index <HASH>..<HASH> 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java
@@ -45,7 +45,7 @@ class JavaBeanBinder implements DataObjectBinder {
@Override
public <T> T bind(ConfigurationPropertyName name, Bindable<T> target, Context context,
DataObjectPropertyBinder propertyBinder) {
- boolean hasKnownBindableProperties = hasKnownBindableProperties(name, context);
+ boolean hasKnownBindableProperties = target.getValue() != null && hasKnownBindableProperties(name, context);
Bean<T> bean = Bean.get(target, hasKnownBindableProperties);
if (bean == null) {
return null;
|
Avoid bindable properties check when target has null value
See gh-<I>
|
diff --git a/lib/setuplib.php b/lib/setuplib.php
index <HASH>..<HASH> 100644
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -366,7 +366,7 @@ function default_exception_handler($ex) {
if (AJAX_SCRIPT) {
// If we are in an AJAX script we don't want to use PREFERRED_RENDERER_TARGET.
// Because we know we will want to use ajax format.
- $renderer = $PAGE->get_renderer('core', null, 'ajax');
+ $renderer = new core_renderer_ajax($PAGE, 'ajax');
} else {
$renderer = $OUTPUT;
}
|
MDL-<I> setuplib: safely construct the ajax renderer when needed
|
diff --git a/spec/support/fixtures/nodes.rb b/spec/support/fixtures/nodes.rb
index <HASH>..<HASH> 100644
--- a/spec/support/fixtures/nodes.rb
+++ b/spec/support/fixtures/nodes.rb
@@ -7,8 +7,8 @@ namespace :production do
end
end
-node :vagrant do
- node_config 'nodes/some_node.json'
- ssh_config 'vagrant config'
+node :vagrant do |n|
+ n.node_config 'nodes/some_node.json'
+ n.ssh_config 'vagrant config'
end
|
update fixture to test both forms of DSL
|
diff --git a/View/Widget/Widget/ChildLinksWidget.php b/View/Widget/Widget/ChildLinksWidget.php
index <HASH>..<HASH> 100644
--- a/View/Widget/Widget/ChildLinksWidget.php
+++ b/View/Widget/Widget/ChildLinksWidget.php
@@ -80,7 +80,7 @@ class ChildLinksWidget extends AbstractWidget
*/
protected function createContent($entity, array $options, $property)
{
- $childClass = $this->entityResolver->resolve($options['child_entity']);
+ $childClass = $this->entityResolver->resolve($options['child']);
$indexLink = $this->isGranted(Permission::VIEW, $childClass)
&& $this->adminRouter->exists($childClass, AdminRouter::TYPE_INDEX);
@@ -141,7 +141,7 @@ class ChildLinksWidget extends AbstractWidget
parent::configureOptions($resolver);
$resolver
- ->setRequired('child_entity')
- ->setAllowedTypes('child_entity', 'string');
+ ->setRequired('child')
+ ->setAllowedTypes('child', 'string');
}
}
|
Refactor child links admin view widget.
|
diff --git a/lib/ore/naming.rb b/lib/ore/naming.rb
index <HASH>..<HASH> 100644
--- a/lib/ore/naming.rb
+++ b/lib/ore/naming.rb
@@ -58,6 +58,21 @@ module Ore
end
#
+ # Converts a camel-case name to an underscored file name.
+ #
+ # @param [String] name
+ # The name to underscore.
+ #
+ # @return [String]
+ # The underscored version of the name.
+ #
+ def underscore(name)
+ name.gsub(/[^A-Z][A-Z][^A-Z]/) { |cap|
+ cap[0,1] + '_' + cap[1..-1]
+ }.downcase
+ end
+
+ #
# Guesses the namespace directory within `lib/` for a project.
#
# @return [String]
diff --git a/spec/naming_spec.rb b/spec/naming_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/naming_spec.rb
+++ b/spec/naming_spec.rb
@@ -8,6 +8,10 @@ describe Naming do
obj
end
+ it "should underscore camel case names" do
+ subject.underscore('FooBar').should == 'foo_bar'
+ end
+
it "should guess the module names from a project name" do
subject.modules_of('foo-bar').should == ['Foo', 'Bar']
end
|
Added Naming#underscore.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,31 +1,22 @@
# encoding: utf-8
-from __future__ import print_function
from setuptools import setup
import sys
# check availability of runtime dependencies
-import argparse
-parser = argparse.ArgumentParser()
-parser.add_argument('-f', '--force', dest="force",
- action="store_true", default=False)
-args, sys.argv = parser.parse_known_args(sys.argv)
-if not args.force:
- try:
- import dbus
- import gobject
- import pynotify
- except ImportError:
- err = sys.exc_info()[1]
- print("Missing runtime dependency:", err)
- print("Use --force if you want to continue anyway.")
- sys.exit(1)
+try:
+ import dbus
+ import gobject
+ import pynotify
+except ImportError:
+ err = sys.exc_info()[1]
+ print("Missing runtime dependency: %s" % err)
# read long_description from README.rst
try:
f = open('README.rst')
long_description = f.read()
f.close()
-except:
+except IOError:
long_description = None
setup(
|
Relax setup.py manual runtime depedendency enforcement
Now, only a warning will be issued if runtime dependencies are unmet.
The previous approach introduced unnecessary complexity and one
additional setup dependency (argparse).
|
diff --git a/pkg/fileutil/purge_test.go b/pkg/fileutil/purge_test.go
index <HASH>..<HASH> 100644
--- a/pkg/fileutil/purge_test.go
+++ b/pkg/fileutil/purge_test.go
@@ -45,7 +45,7 @@ func TestPurgeFile(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- time.Sleep(2 * time.Millisecond)
+ time.Sleep(10 * time.Millisecond)
}
fnames, err := ReadDir(dir)
if err != nil {
|
pkg/fileutil: fix TestPurgeFile
It needs to wait longer for file to be detected and removed sometimes.
|
diff --git a/core/src/main/java/smile/wavelet/Wavelet.java b/core/src/main/java/smile/wavelet/Wavelet.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/smile/wavelet/Wavelet.java
+++ b/core/src/main/java/smile/wavelet/Wavelet.java
@@ -55,20 +55,18 @@ public class Wavelet {
* Constructor. Create a wavelet with given coefficients.
*/
public Wavelet(double[] coefficients) {
- if (coefficients != null) {
- ncof = coefficients.length;
+ ncof = coefficients.length;
- ioff = joff = -(ncof >> 1);
- // ioff = -2; joff = -ncof + 2; // Alternative centering, used by D4.
+ ioff = joff = -(ncof >> 1);
+ // ioff = -2; joff = -ncof + 2; // Alternative centering, used by D4.
- cc = coefficients;
+ cc = coefficients;
- double sig = -1.0;
- cr = new double[ncof];
- for (int i = 0; i < ncof; i++) {
- cr[ncof - 1 - i] = sig * cc[i];
- sig = -sig;
- }
+ double sig = -1.0;
+ cr = new double[ncof];
+ for (int i = 0; i < ncof; i++) {
+ cr[ncof - 1 - i] = sig * cc[i];
+ sig = -sig;
}
}
|
coefficients cannot be null as HaarWavelet pass it now
|
diff --git a/source/core/smarty/plugins/oxemosadapter.php b/source/core/smarty/plugins/oxemosadapter.php
index <HASH>..<HASH> 100644
--- a/source/core/smarty/plugins/oxemosadapter.php
+++ b/source/core/smarty/plugins/oxemosadapter.php
@@ -421,7 +421,7 @@ class oxEmosAdapter extends oxSuperCfg
}
$oEmos->addEmosBasketPageArray( $aBasket );
break;
- case 'oxwarticledetails':
+ case 'details':
if ( $oProduct ) {
//$oEmos->addContent( 'Shop/'.$this->_getEmosCatPath().'/'.strip_tags( $oProduct->oxarticles__oxtitle->value ) );
//$sPath = $this->_getDeepestCategoryPath( $oProduct );
|
Revert 3a7ea<I>, testGetCodeForDetails was failing.
|
diff --git a/pmagpy/data_model3.py b/pmagpy/data_model3.py
index <HASH>..<HASH> 100644
--- a/pmagpy/data_model3.py
+++ b/pmagpy/data_model3.py
@@ -8,6 +8,8 @@ except ImportError:
import pandas as pd
from pmagpy import find_pmag_dir
+DM = []
+CRIT_MAP = []
class DataModel():
@@ -18,8 +20,15 @@ class DataModel():
"""
def __init__(self, offline=False):
+ global DM, CRIT_MAP
self.offline = offline
- self.dm, self.crit_map = self.get_data_model()
+ if not len(DM):
+ self.dm, self.crit_map = self.get_data_model()
+ DM = self.dm
+ CRIT_MAP = self.crit_map
+ else:
+ self.dm = DM
+ self.crit_map = CRIT_MAP
def get_data_model(self):
|
use globals to prevent data model from being re-acquired each time, related to #<I>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -176,7 +176,7 @@ ECDSA.prototype.verify = function verify(message, signature, format = 'base64')
const verify = crypto.createVerify('RSA-SHA256') // RSA works with EC keys, too
verify.write(message)
verify.end()
- const key = this.isPrivate ? this.asPublicECDSA() : this
+ const key = this.isPrivate ? this.asPublic() : this
const signatureBuffer = Buffer.from(signature, format)
return verify.verify(
key.toPEM(),
|
Update index.js
There was a call being made to a asPublicECDSA method in verify which doesn't exist. asPublic was probably what was intended.
|
diff --git a/lib/ruby-asterisk.rb b/lib/ruby-asterisk.rb
index <HASH>..<HASH> 100644
--- a/lib/ruby-asterisk.rb
+++ b/lib/ruby-asterisk.rb
@@ -89,7 +89,7 @@ module RubyAsterisk
execute "Queues", {}
end
- def queue_add(queue, exten, penalty=2, paused=false, member_name)
+ def queue_add(queue, exten, penalty = 2, paused = false, member_name = '')
execute "QueueAdd", {"Queue" => queue, "Interface" => exten, "Penalty" => penalty, "Paused" => paused, "MemberName" => member_name}
end
|
Fixing bug with jRuby - issue #<I>
|
diff --git a/teslajsonpy/homeassistant/power.py b/teslajsonpy/homeassistant/power.py
index <HASH>..<HASH> 100644
--- a/teslajsonpy/homeassistant/power.py
+++ b/teslajsonpy/homeassistant/power.py
@@ -134,9 +134,15 @@ class PowerSensor(EnergySiteDevice):
"""
super().refresh()
data = self._controller.get_power_params(self._id)
+
if data:
# Note: Some systems that pre-date Tesla aquisition of SolarCity will have `grid_status: Unknown`,
- # but will have solar power values
+ # but will have solar power values. At the same time, newer systems will report spurious reads of 0 Watts
+ # and grid status unknown. If solar power is 0 return null.
+ if "grid_status" in data and data["grid_status"] == "Unknown" and data["solar_power"] == 0:
+ _LOGGER.debug("Spurious energy site power read")
+ return
+
self.__power = data["solar_power"]
if data["solar_power"] is not None:
self.__generating_status = (
|
fix: improve handling on 0 Watts spurious power reads (#<I>)
closes #<I>
|
diff --git a/tests/TestCase.php b/tests/TestCase.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -96,13 +96,13 @@ abstract class TestCase extends BaseTestCase
* @param Jsonable|mixed $object
* @param string $message
*/
- public static function assertJson($object, $message = '')
+ public static function assertJsonObject($object, $message = '')
{
self::assertInstanceOf(Jsonable::class, $object);
- parent::assertJson($object->toJson(JSON_PRETTY_PRINT), $message);
+ self::assertJson($object->toJson(JSON_PRETTY_PRINT), $message);
self::assertInstanceOf(JsonSerializable::class, $object);
- parent::assertJson(json_encode($object, JSON_PRETTY_PRINT), $message);
+ self::assertJson(json_encode($object, JSON_PRETTY_PRINT), $message);
}
/**
|
Updating the base TestCase
|
diff --git a/lib/resource/Application.js b/lib/resource/Application.js
index <HASH>..<HASH> 100644
--- a/lib/resource/Application.js
+++ b/lib/resource/Application.js
@@ -330,7 +330,7 @@ Application.prototype.authenticateApiRequest = function authenticateApiRequest(o
}
if(!authenticator){
- return callback(new ApiAuthRequestError('Invalid authentication request. Must provide access_token, or request access token.'));
+ return callback(new ApiAuthRequestError('Must provide access_token.',401));
}
if(authenticator instanceof Error){
|
More descriptive <I> for fallback case
|
diff --git a/lib/gir_ffi/out_pointer.rb b/lib/gir_ffi/out_pointer.rb
index <HASH>..<HASH> 100644
--- a/lib/gir_ffi/out_pointer.rb
+++ b/lib/gir_ffi/out_pointer.rb
@@ -1,12 +1,14 @@
+require 'gir_ffi/in_out_pointer'
+
module GirFFI
# The OutPointer class handles setup of pointers and their conversion to
# ruby types for arguments with direction :out.
- class OutPointer < FFI::Pointer
+ class OutPointer < InOutPointer
def self.for type
- ffi_type = InOutPointer.type_to_ffi_type type
+ ffi_type = type_to_ffi_type type
ptr = AllocationHelper.safe_malloc(FFI.type_size ffi_type)
ptr.send "put_#{ffi_type}", 0, 0
- self.new ptr
+ self.new ptr, type, ffi_type
end
end
end
|
Base OutPointer on InOutPointer. Preparing for merge.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -147,10 +147,10 @@ def call_scm(options, *args, **kwargs):
raise ValueError("Unknown SCM type `%s'" % __pkg_data__.SCM)
try:
process = Popen(options, *args, **kwargs)
- except OSError as e:
- print("Error calling `%s`, is %s installed? [%s]"
- % (options[0], __pkg_data__.SCM, e))
- sys.exit(1)
+ except OSError:
+ print("Error calling `%s`, is %s installed?"
+ % (options[0], __pkg_data__.SCM))
+ raise
process.wait()
if not process.returncode == 0:
print("`%s' completed with %i return code"
|
Fixes to run with Python <I>.
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -143,7 +143,7 @@ module.exports = function(grunt) {
grunt.registerTask(
'build',
'Creates a temporary build of the library in the build folder, then runs the specs on it.',
- [ 'clean:dist', 'compile', 'spec' ]
+ [ 'clean:build', 'compile', 'spec' ]
);
grunt.registerTask(
|
Don't remove dist files when building
|
diff --git a/canvasvg.py b/canvasvg.py
index <HASH>..<HASH> 100644
--- a/canvasvg.py
+++ b/canvasvg.py
@@ -258,7 +258,7 @@ def convert(document, canvas, items=None, tounicode=None):
for attr, value in style.items():
- if value: # create only nonempty attributes
+ if value != '': # create only nonempty attributes
element.setAttribute(attr, str(value))
return elements
|
Fix style attributes setting
The code to set all the style attributes uses a check to only set
those attributes that are not of the default value. The check should
have checked only for empty strings, but it just checked if the value
evaluated to False. This leads to incorrect behaviour if something
should be set to zero, because zero also evaluates to False (and
for some attributes zero is not the default value).
Now the check is for an empty string as value.
|
diff --git a/src/Market/History/MarketHistory.php b/src/Market/History/MarketHistory.php
index <HASH>..<HASH> 100644
--- a/src/Market/History/MarketHistory.php
+++ b/src/Market/History/MarketHistory.php
@@ -5,7 +5,6 @@ namespace EveOnline\Market\History;
use GuzzleHttp\Client;
use GuzzleHttp\Pool;
use GuzzleHttp\Psr7\Request;
-use \Carbon\Carbon;
class MarketHistory {
diff --git a/src/Market/Orders/Order.php b/src/Market/Orders/Order.php
index <HASH>..<HASH> 100644
--- a/src/Market/Orders/Order.php
+++ b/src/Market/Orders/Order.php
@@ -2,8 +2,6 @@
namespace EveOnline\Market\Orders;
-use Illuminate\Database\Eloquent\Collection;
-
use GuzzleHttp\Client;
use GuzzleHttp\Psr7\Request;
@@ -124,7 +122,7 @@ class Order {
protected function getRegionDetails($regionHref) {
$response = $this->client->request('GET', $regionHref);
-
+
return json_decode($response->getBody()->getContents());
}
|
removed some imports that are no loner needed.
|
diff --git a/test/test-role-from-tag.js b/test/test-role-from-tag.js
index <HASH>..<HASH> 100644
--- a/test/test-role-from-tag.js
+++ b/test/test-role-from-tag.js
@@ -115,7 +115,6 @@ describe('loud', function() {
'<input type="number" min="0" value="1" max="4">': ['spinbutton', 1],
'<progress value="1">': ['progressbar', 1],
- '<progress value="10">': ['progressbar', 10],
'<progress min="0" value="1" max="4">': ['progressbar', 25, 'percent'],
'<dd>Content</dd>': ['Content'],
|
Drop testing an arbitrary value of <progress>
IE<I> expect a value for <progress> between 0 and 1.
|
diff --git a/pagoda/physics.py b/pagoda/physics.py
index <HASH>..<HASH> 100644
--- a/pagoda/physics.py
+++ b/pagoda/physics.py
@@ -1043,33 +1043,33 @@ class World(base.World):
@property
def cfm(self):
- '''Current default CFM value for the world.'''
+ '''Current global CFM value.'''
return self.ode_world.getCFM()
@cfm.setter
def cfm(self, cfm):
- '''Set the current default CFM value in the world.
+ '''Set the global CFM value.
Parameters
----------
cfm : float
- The CFM value that should be the world default.
+ The desired global CFM value.
'''
return self.ode_world.setCFM(cfm)
@property
def erp(self):
- '''Current default ERP value for the world.'''
+ '''Current global ERP value.'''
return self.ode_world.getERP()
@erp.setter
def erp(self, erp):
- '''Set the current default ERP value in the world.
+ '''Set the global ERP value.
Parameters
----------
erp : float
- The ERP value that should be the world default.
+ The desired global ERP value.
'''
return self.ode_world.setERP(erp)
|
Fix global CFM/ERP docstrings.
|
diff --git a/modules/caddyhttp/reverseproxy/command.go b/modules/caddyhttp/reverseproxy/command.go
index <HASH>..<HASH> 100644
--- a/modules/caddyhttp/reverseproxy/command.go
+++ b/modules/caddyhttp/reverseproxy/command.go
@@ -18,6 +18,7 @@ import (
"encoding/json"
"flag"
"fmt"
+ "net"
"net/http"
"net/url"
"strings"
@@ -80,6 +81,14 @@ func cmdReverseProxy(fs caddycmd.Flags) (int, error) {
return caddy.ExitCodeFailedStartup, fmt.Errorf("parsing 'to' URL: %v", err)
}
+ if toURL.Port() == "" {
+ toPort := "80"
+ if toURL.Scheme == "https" {
+ toPort = "443"
+ }
+ toURL.Host = net.JoinHostPort(toURL.Host, toPort)
+ }
+
ht := HTTPTransport{}
if toURL.Scheme == "https" {
ht.TLS = new(TLSConfig)
|
reverse_proxy: Add port to upstream address if only implied in scheme
|
diff --git a/models/check.js b/models/check.js
index <HASH>..<HASH> 100644
--- a/models/check.js
+++ b/models/check.js
@@ -19,6 +19,7 @@ var Check = new Schema({
maxTime : { type: Number, default: 1500 }, // time under which a ping is considered responsive
tags : [String],
lastChanged : Date,
+ firstTested : Date,
lastTested : Date,
isUp : Boolean,
isPaused : { type:Boolean, default: false },
@@ -54,8 +55,9 @@ Check.methods.removeStats = function(callback) {
Check.methods.needsPoll = function() {
if (this.isPaused) return false;
- if (!this.lastTested) return true;
- return (Date.now() - this.lastTested.getTime()) > (this.interval || 60000);
+ if (!this.firstTested) return true;
+ var delay = (this.lastTested.getTime() - this.firstTested.getTime()) % this.interval;
+ return (Date.now() - this.lastTested.getTime() + delay) >= (this.interval || 60000);
}
Check.methods.togglePause = function() {
@@ -64,6 +66,7 @@ Check.methods.togglePause = function() {
Check.methods.setLastTest = function(status, time) {
var now = time ? new Date(time) : new Date();
+ if (!this.firstTested) this.firstTested = now;
this.lastTested = now;
if (this.isUp != status) {
var event = new CheckEvent({
|
Make actual polling interval more accurate.
Previously, the time necessary to actually poll a check would delay the
next poll. Now the reference is the first poll, and the interval between
two polls on a given check should be closer to the specified interval.
Closes #8.
|
diff --git a/PhpUnit/AbstractExtensionTestCase.php b/PhpUnit/AbstractExtensionTestCase.php
index <HASH>..<HASH> 100644
--- a/PhpUnit/AbstractExtensionTestCase.php
+++ b/PhpUnit/AbstractExtensionTestCase.php
@@ -45,9 +45,6 @@ abstract class AbstractExtensionTestCase extends AbstractContainerBuilderTestCas
* Call this method from within your test after you have (optionally) modified the ContainerBuilder for this test
* ($this->container).
*
- * If your extension(s) implements \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface, you may
- * set $withPrependInvocation to TRUE to invoke prepend() method prior to load() method of your extension.
- *
* @param array $configurationValues
*/
protected function load(array $configurationValues = array())
@@ -55,7 +52,6 @@ abstract class AbstractExtensionTestCase extends AbstractContainerBuilderTestCas
$configs = array($this->getMinimalConfiguration(), $configurationValues);
foreach ($this->container->getExtensions() as $extension) {
-
if ($extension instanceof PrependExtensionInterface) {
$extension->prepend($this->container);
}
|
Removed outdated comment for AbstractExtensionTestCase::load method
|
diff --git a/lib/openstax/salesforce/version.rb b/lib/openstax/salesforce/version.rb
index <HASH>..<HASH> 100644
--- a/lib/openstax/salesforce/version.rb
+++ b/lib/openstax/salesforce/version.rb
@@ -1,5 +1,5 @@
module OpenStax
module Salesforce
- VERSION = '5.4.0'
+ VERSION = '6.0.0'
end
end
|
major version bump due to changing field names
|
diff --git a/closure/goog/testing/testcase.js b/closure/goog/testing/testcase.js
index <HASH>..<HASH> 100644
--- a/closure/goog/testing/testcase.js
+++ b/closure/goog/testing/testcase.js
@@ -171,7 +171,7 @@ goog.testing.TestCase.maxRunTime = 200;
* techniques like tail cail optimization can affect the exact depth.
* @private @const
*/
-goog.testing.TestCase.MAX_STACK_DEPTH_ = 100;
+goog.testing.TestCase.MAX_STACK_DEPTH_ = 50;
/**
|
Cut goog.testing.TestCase.MAX_STACK_DEPTH_ in half to <I> to deflake stack recursion failures
-------------
Created by MOE: <URL>
|
diff --git a/scripts/get_bank_registry_be.py b/scripts/get_bank_registry_be.py
index <HASH>..<HASH> 100644
--- a/scripts/get_bank_registry_be.py
+++ b/scripts/get_bank_registry_be.py
@@ -20,9 +20,8 @@ def process(URL):
row_count += 1
row = sheet.row_values(i)
column = 0
- registry_entry_template = {"bank_code": None, "bic": None,
- "country_code": "BE", "name": None,
- "primary": True, "short_name": None}
+ registry_entry_template = {"bank_code": None, "bic": None, "country_code": "BE",
+ "name": None, "primary": True, "short_name": None}
skip_row = False
for cell in row:
if column == 1:
|
Corrected indentation again..
|
diff --git a/packages/ember-routing/lib/system/router.js b/packages/ember-routing/lib/system/router.js
index <HASH>..<HASH> 100644
--- a/packages/ember-routing/lib/system/router.js
+++ b/packages/ember-routing/lib/system/router.js
@@ -40,6 +40,7 @@ var slice = [].slice;
@class Router
@namespace Ember
@extends Ember.Object
+ @uses Ember.Evented
*/
var EmberRouter = EmberObject.extend(Evented, {
/**
|
[DOC release] Documented Evented for Router
|
diff --git a/externs/es3.js b/externs/es3.js
index <HASH>..<HASH> 100644
--- a/externs/es3.js
+++ b/externs/es3.js
@@ -1663,7 +1663,9 @@ String.prototype.localeCompare = function(other) {};
* expression.
*
* @param {*} regexp
- * @return {Array|null}
+ * @return {Array.<string>} This should really return an Array with a few
+ * special properties, but we do not have a good way to model this in
+ * our type system. Also see Regexp.prototype.exec.
* @see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/String/match
*/
String.prototype.match = function(regexp) {};
@@ -1843,7 +1845,9 @@ RegExp.prototype.compile = function(pattern, opt_flags) {};
/**
* @param {*} str The string to search.
- * @return {Array.<string>|null}
+ * @return {Array.<string>} This should really return an Array with a few
+ * special properties, but we do not have a good way to model this in
+ * our type system. Also see String.prototype.match.
* @see http://msdn.microsoft.com/en-us/library/z908hy33(VS.85).aspx
* @see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/RegExp/exec
*/
|
Better type info for String.prototype.match
Fixes issue <I>
try #2
R=johnlenz
DELTA=6 (4 added, 0 deleted, 2 changed)
Revision created by MOE tool push_codebase.
MOE_MIGRATION=<I>
git-svn-id: <URL>
|
diff --git a/src/javascripts/ng-admin/Crud/routing.js b/src/javascripts/ng-admin/Crud/routing.js
index <HASH>..<HASH> 100644
--- a/src/javascripts/ng-admin/Crud/routing.js
+++ b/src/javascripts/ng-admin/Crud/routing.js
@@ -174,7 +174,7 @@ define(function (require) {
$stateProvider
.state('batchDelete', {
parent: 'main',
- url: '/batch-delete/:entity/{ids:json}',
+ url: '/:entity/batch-delete/{ids:json}',
controller: 'BatchDeleteController',
controllerAs: 'batchDeleteController',
templateProvider: templateProvider('BatchDeleteView', batchDeleteTemplate),
|
Switch new route to entity name first, too
|
diff --git a/src/Phpro/SoapClient/Middleware/BasicAuthMiddleware.php b/src/Phpro/SoapClient/Middleware/BasicAuthMiddleware.php
index <HASH>..<HASH> 100644
--- a/src/Phpro/SoapClient/Middleware/BasicAuthMiddleware.php
+++ b/src/Phpro/SoapClient/Middleware/BasicAuthMiddleware.php
@@ -48,7 +48,7 @@ class BasicAuthMiddleware extends Middleware
public function beforeRequest(callable $handler, RequestInterface $request, array $options)
{
$request = $request->withHeader(
- 'Authentication',
+ 'Authorization',
sprintf('Basic %s', base64_encode(
sprintf('%s:%s', $this->username, $this->password)
))
|
Fixed authorization header for HTTP Basic Auth
|
diff --git a/src/Doc/MethodDoc.js b/src/Doc/MethodDoc.js
index <HASH>..<HASH> 100644
--- a/src/Doc/MethodDoc.js
+++ b/src/Doc/MethodDoc.js
@@ -44,7 +44,9 @@ export default class MethodDoc extends AbstractDoc {
super['@param']();
if (this._value.params) return;
- this._value.params = ParamParser.guessParams(this._node.value.params);
+ if (this._value.kind !== 'set') {
+ this._value.params = ParamParser.guessParams(this._node.value.params);
+ }
}
['@return']() {
|
test: don't guess with set method.
|
diff --git a/src/test/java/us/bpsm/edn/printer/PrinterTest.java b/src/test/java/us/bpsm/edn/printer/PrinterTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/us/bpsm/edn/printer/PrinterTest.java
+++ b/src/test/java/us/bpsm/edn/printer/PrinterTest.java
@@ -109,10 +109,10 @@ public class PrinterTest {
@Test
public void testPrettyPrinting() {
- Map<Integer, String> m = new HashMap();
+ Map<Integer, String> m = new LinkedHashMap();
m.put(3, "Three");
m.put(4, "Four");
- List<?> list = Arrays.asList(new HashSet(Arrays.asList(1, 2)), m);
+ List<?> list = Arrays.asList(new LinkedHashSet(Arrays.asList(1, 2)), m);
String s = Printers.printString(Printers.prettyPrinterProtocol(), list);
assertEquals("[\n #{\n 1\n 2\n }\n {\n 3 \"Three\"\n 4 \"Four\"\n }\n]", s);
}
|
Fix flaky test by using LinkedHashMap and LinkedHashSet
|
diff --git a/web/AccessMap.php b/web/AccessMap.php
index <HASH>..<HASH> 100644
--- a/web/AccessMap.php
+++ b/web/AccessMap.php
@@ -79,6 +79,7 @@ class AccessMap extends \mpf\base\LogAwareObject implements \mpf\interfaces\Acce
* @return boolean
*/
public function canAccess($controller, $action, $module = null) {
+ $module = is_array($module)?null:$module;
$rights = $this->getRightsFromMap($controller, $action, $module);
if ('*' == $rights[0]) {
return true;
|
Add a check for module so that params are not sent instead
|
diff --git a/visidata/vdtui.py b/visidata/vdtui.py
index <HASH>..<HASH> 100755
--- a/visidata/vdtui.py
+++ b/visidata/vdtui.py
@@ -494,6 +494,7 @@ class VisiData:
def sync(self, expectedThreads=0):
'Wait for all but expectedThreads async threads to finish.'
while len(self.unfinishedThreads) > expectedThreads:
+ time.sleep(.3)
self.checkForFinishedThreads()
def refresh(self):
|
[vdtui] sync() should sleep() in spin loop
|
diff --git a/manifest.php b/manifest.php
index <HASH>..<HASH> 100755
--- a/manifest.php
+++ b/manifest.php
@@ -33,7 +33,7 @@ return array(
'label' => 'Test-taker core extension',
'description' => 'TAO TestTaker extension',
'license' => 'GPL-2.0',
- 'version' => '3.11.3',
+ 'version' => '3.11.4',
'author' => 'Open Assessment Technologies, CRP Henri Tudor',
'requires' => array(
'tao' => '>=19.23.0',
|
Merge branch 'develop' into feature/TAO-<I>/add-dutch-language
# Conflicts:
# manifest.php
# scripts/update/Updater.php
|
diff --git a/galpy/orbit/Orbits.py b/galpy/orbit/Orbits.py
index <HASH>..<HASH> 100644
--- a/galpy/orbit/Orbits.py
+++ b/galpy/orbit/Orbits.py
@@ -1015,7 +1015,7 @@ class Orbits(object):
or (not type is None and type != self._aAType) \
or (not delta is None and hasattr(self._aA,'_delta')
and numpy.any(delta != self._aA._delta)) \
- or (not delta is None
+ or (delta is None
and hasattr(self,'_aA_delta_automagic')
and not self._aA_delta_automagic) \
or (not b is None and hasattr(self._aA,'_aAI')
|
Fix setting delta in the Orbits actionAngle functions again
|
diff --git a/src/command/command.php b/src/command/command.php
index <HASH>..<HASH> 100644
--- a/src/command/command.php
+++ b/src/command/command.php
@@ -35,6 +35,12 @@ abstract class Command {
/**
* @param $lines
+ *
+ * @throws \SMB\NotFoundException
+ * @throws \SMB\AlreadyExistsException
+ * @throws \SMB\AccessDeniedException
+ * @throws \SMB\NotEmptyException
+ * @throws \Exception
* @return bool
*/
protected function parseOutput($lines) {
diff --git a/src/command/put.php b/src/command/put.php
index <HASH>..<HASH> 100644
--- a/src/command/put.php
+++ b/src/command/put.php
@@ -18,6 +18,8 @@ class Put extends Command {
/**
* @param $lines
+ *
+ * @throws \SMB\NotFoundException
* @return bool
*/
protected function parseOutput($lines) {
@@ -29,6 +31,7 @@ class Put extends Command {
} else {
parent::parseOutput($lines);
}
+ return false;
}
}
}
|
Add @throws to phpdoc
|
diff --git a/activerecord/lib/active_record/enum.rb b/activerecord/lib/active_record/enum.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/enum.rb
+++ b/activerecord/lib/active_record/enum.rb
@@ -106,6 +106,7 @@ module ActiveRecord
end
def type_cast_from_database(value)
+ return if value.nil?
mapping.key(value.to_i)
end
diff --git a/activerecord/test/cases/enum_test.rb b/activerecord/test/cases/enum_test.rb
index <HASH>..<HASH> 100644
--- a/activerecord/test/cases/enum_test.rb
+++ b/activerecord/test/cases/enum_test.rb
@@ -168,19 +168,24 @@ class EnumTest < ActiveRecord::TestCase
assert_equal "'unknown' is not a valid status", e.message
end
+ test "NULL values from database should be casted to nil" do
+ Book.where(id: @book.id).update_all("status = NULL")
+ assert_nil @book.reload.status
+ end
+
test "assign nil value" do
@book.status = nil
- assert @book.status.nil?
+ assert_nil @book.status
end
test "assign empty string value" do
@book.status = ''
- assert @book.status.nil?
+ assert_nil @book.status
end
test "assign long empty string value" do
@book.status = ' '
- assert @book.status.nil?
+ assert_nil @book.status
end
test "constant to access the mapping" do
|
Fixed a bug where NULLs are casted into the first enum value
|
diff --git a/client-side/grido.js b/client-side/grido.js
index <HASH>..<HASH> 100644
--- a/client-side/grido.js
+++ b/client-side/grido.js
@@ -83,14 +83,19 @@
*/
initActions: function()
{
+ var _this = this;
$('.actions a', this.$table)
+ .off('click.nette')
.off('click.grido')
.on('click.grido', function(event) {
var hasConfirm = $(this).data('grido-confirm');
if (hasConfirm && !confirm(hasConfirm)) {
event.preventDefault();
event.stopImmediatePropagation();
- return false;
+ } else if (hasConfirm && $(this).hasClass('ajax') && _this.ajax) {
+ _this.ajax.doRequest(this.href);
+ event.preventDefault();
+ event.stopImmediatePropagation();
}
});
},
|
Client side: Added support for ajaxified action links with confirmation dialog [Closed #<I>]
|
diff --git a/yangson/parser.py b/yangson/parser.py
index <HASH>..<HASH> 100644
--- a/yangson/parser.py
+++ b/yangson/parser.py
@@ -125,6 +125,17 @@ class Parser:
"""
return self.match_regex(ident_re, True, "YANG identifier")
+ def instance_name(self) -> QualName:
+ """Parse instance name."""
+ i1 = self.yang_identifier()
+ try:
+ next = self.peek()
+ except EndOfInput:
+ return (i1, None)
+ if next != ":": return (i1, None)
+ self.offset += 1
+ return (self.yang_identifier(), i1)
+
def skip_ws(self) -> None:
"""Skip optional whitespace."""
self.match_regex(ws_re)
|
Add method Parser::instance_name.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@ setup(name='aiohttp_admin',
platforms=['POSIX'],
author="Nikolay Novik",
author_email="nickolainovik@gmail.com",
- url='',
+ url='https://github.com/jettify/aiohttp_admin',
download_url='',
license='Apache 2',
packages=find_packages(),
|
update url in setup.py
|
diff --git a/src/Consumer.php b/src/Consumer.php
index <HASH>..<HASH> 100644
--- a/src/Consumer.php
+++ b/src/Consumer.php
@@ -70,9 +70,7 @@ class Consumer extends Request
// consume
while (count($this->getChannel()->callbacks)) {
- $this->getChannel()->wait(
- null,
- !$this->getProperty('blocking'),
+ $this->getChannel()->wait(null, false,
$this->getProperty('timeout') ? $this->getProperty('timeout') : 0
);
}
|
Always operate in blocking mode
Due to changes in php-amqplib/php-amqplib#<I>, non-blocking mode does not use a timeout, which results in an infinite loop and high CPU.
This change ensures that only blocking mode is used.
Fixes #<I>
|
diff --git a/packages/size-limit/run.js b/packages/size-limit/run.js
index <HASH>..<HASH> 100644
--- a/packages/size-limit/run.js
+++ b/packages/size-limit/run.js
@@ -80,7 +80,7 @@ module.exports = async process => {
await calcAndShow()
if (hasArg('--watch')) {
- let watcher = chokidar.watch(['**/*.js', 'package.json'], {
+ let watcher = chokidar.watch(['**/*'], {
ignored: '**/node_modules/**'
})
watcher.on('change', throttle(calcAndShow))
|
Improve watch mode (#<I>)
* Remove file extension from watch glob
* Remove package.json from watch patterns
|
diff --git a/jaraco/__init__.py b/jaraco/__init__.py
index <HASH>..<HASH> 100644
--- a/jaraco/__init__.py
+++ b/jaraco/__init__.py
@@ -1,2 +1,10 @@
# this is a namespace package
-__import__('pkg_resources').declare_namespace(__name__)
\ No newline at end of file
+__import__('pkg_resources').declare_namespace(__name__)
+
+try:
+ # py2exe support (http://www.py2exe.org/index.cgi/ExeWithEggs)
+ import modulefinder
+ for p in __path__:
+ modulefinder.AddPackagePath(__name__, p)
+except ImportError:
+ pass
|
Updated namespace package to support py2exe
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -99,8 +99,11 @@ export default function plugin (options = {}) {
if (dest.endsWith('.js')) {
dest = dest.slice(0, -3)
}
-
- return writeFileSync(`${dest}.css`, css)
+ dest = `${dest}.css`
+ ensureFileSync(dest, (err) => {
+ if (err) throw err
+ })
+ return writeFileSync(dest, css)
}
}
}
|
miss ensureFileSync when writeFileSync
|
diff --git a/bits/47_styxml.js b/bits/47_styxml.js
index <HASH>..<HASH> 100644
--- a/bits/47_styxml.js
+++ b/bits/47_styxml.js
@@ -318,7 +318,7 @@ function parse_cellXfs(t, styles, opts) {
xf[cellXF_uint[i]] = parseInt(xf[cellXF_uint[i]], 10);
for(i = 0; i < cellXF_bool.length; ++i) if(xf[cellXF_bool[i]])
xf[cellXF_bool[i]] = parsexmlbool(xf[cellXF_bool[i]]);
- if(xf.numFmtId > 0x188) {
+ if(styles.NumberFmt && xf.numFmtId > 0x188) {
for(i = 0x188; i > 0x3c; --i) if(styles.NumberFmt[xf.numFmtId] == styles.NumberFmt[i]) { xf.numFmtId = i; break; }
}
styles.CellXf.push(xf); break;
|
Fix TypeError when styles don't have NumberFmt
|
diff --git a/commands/delete.go b/commands/delete.go
index <HASH>..<HASH> 100644
--- a/commands/delete.go
+++ b/commands/delete.go
@@ -88,13 +88,17 @@ func delete(command *Command, args *Args) {
}
}
- err = gh.DeleteRepository(project)
- if err != nil && strings.Contains(err.Error(), "HTTP 403") {
- fmt.Println("Please edit the token used for hub at https://github.com/settings/tokens\nand verify that the `delete_repo` scope is enabled.\n")
+ if args.Noop {
+ ui.Printf("Would delete repository '%s'.\n", project)
+ } else {
+ err = gh.DeleteRepository(project)
+ if err != nil && strings.Contains(err.Error(), "HTTP 403") {
+ ui.Errorln("Please edit the token used for hub at https://github.com/settings/tokens")
+ ui.Errorln("and verify that the `delete_repo` scope is enabled.")
+ }
+ utils.Check(err)
+ ui.Printf("Deleted repository '%s'.\n", project)
}
- utils.Check(err)
-
- fmt.Printf("Deleted repository %v\n", repoName)
args.NoForward()
}
|
Respect `hub --noop delete <REPO>` mode
|
diff --git a/test/test.stats.quantiles.js b/test/test.stats.quantiles.js
index <HASH>..<HASH> 100644
--- a/test/test.stats.quantiles.js
+++ b/test/test.stats.quantiles.js
@@ -92,7 +92,7 @@ describe( 'stats/quantiles', function tests() {
*/
function onRead( error, actual ) {
expect( error ).to.not.exist;
- assert.deepEqual( JSON.parse( actual ), expected );
+ assert.deepEqual( actual[ 0 ], expected );
done();
} // end FUNCTION onRead()
});
|
[UPDATE] quantiles test.
|
diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
+++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java
@@ -45,7 +45,7 @@ public class AuthenticatedImagePullTest {
@ClassRule
public static GenericContainer<?> authenticatedRegistry = new GenericContainer<>(new ImageFromDockerfile()
.withDockerfileFromBuilder(builder -> {
- builder.from("registry:2")
+ builder.from("registry:2.7.0")
.run("htpasswd -Bbn testuser notasecret > /htpasswd")
.env("REGISTRY_AUTH", "htpasswd")
.env("REGISTRY_AUTH_HTPASSWD_PATH", "/htpasswd")
|
Pin registry image used for testing (#<I>)
As a workaround for <URL>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -543,6 +543,7 @@ export default class Carousel extends Component {
const style = [
containerCustomStyle || {},
+ { width: sliderWidth },
// LTR hack; see https://github.com/facebook/react-native/issues/11960
{ flexDirection: IS_RTL ? 'row-reverse' : 'row' }
];
|
fix(module): prevent issues when 'sliderWidth' is smaller than viewport's width
|
diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinkingResource.java b/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinkingResource.java
index <HASH>..<HASH> 100644
--- a/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinkingResource.java
+++ b/org.eclipse.xtext/src/org/eclipse/xtext/linking/lazy/LazyLinkingResource.java
@@ -105,7 +105,7 @@ public class LazyLinkingResource extends XtextResource {
@Named(CYCLIC_LINKING_DECTECTION_COUNTER_LIMIT)
@Inject(optional=true)
- private int cyclicLinkingDectectionCounterLimit = 100;
+ protected int cyclicLinkingDectectionCounterLimit = 100;
private int cyclicLinkingDetectionCounter = 0;
@@ -306,9 +306,9 @@ public class LazyLinkingResource extends XtextResource {
return null;
} finally {
if (cyclicLinkingDetectionCounter > cyclicLinkingDectectionCounterLimit) {
- resolving.remove(triple);
- }
- cyclicLinkingDetectionCounter--;
+ resolving.remove(triple);
+ }
+ cyclicLinkingDetectionCounter--;
}
}
|
review feedback
- indentation
- make counter limit protected
|
diff --git a/mailqueue/models.py b/mailqueue/models.py
index <HASH>..<HASH> 100644
--- a/mailqueue/models.py
+++ b/mailqueue/models.py
@@ -68,7 +68,8 @@ class MailerMessage(models.Model):
if self.pk is None:
self._save_without_sending()
- Attachment.objects.create(email=self, file_attachment=attachment, original_filename=attachment.file.name)
+ Attachment.objects.create(email=self, file_attachment=attachment,
+ original_filename=attachment.file.name.split('/')[-1])
def _save_without_sending(self, *args, **kwargs):
"""
|
original_filename should also be split from its path
|
diff --git a/Classes/TYPO3/Fluid/Core/Parser/SyntaxTree/ObjectAccessorNode.php b/Classes/TYPO3/Fluid/Core/Parser/SyntaxTree/ObjectAccessorNode.php
index <HASH>..<HASH> 100644
--- a/Classes/TYPO3/Fluid/Core/Parser/SyntaxTree/ObjectAccessorNode.php
+++ b/Classes/TYPO3/Fluid/Core/Parser/SyntaxTree/ObjectAccessorNode.php
@@ -96,13 +96,7 @@ class ObjectAccessorNode extends AbstractNode
if (is_object($subject)
&& preg_match('/^(is|has)([A-Z].*)/', $propertyName, $matches) > 0
&& is_callable([$subject, $propertyName])) {
- try {
- $subject = $subject->$propertyName();
- } catch (\Throwable $exception) {
- $subject = null;
- } catch (\Exception $exception) {
- $subject = null;
- }
+ $subject = $subject->$propertyName();
} else {
$subject = null;
}
|
TASK: removed is/has try-catch block
Removed redundant check again.
|
diff --git a/renku/service/entrypoint.py b/renku/service/entrypoint.py
index <HASH>..<HASH> 100644
--- a/renku/service/entrypoint.py
+++ b/renku/service/entrypoint.py
@@ -56,6 +56,7 @@ from renku.service.views.datasets import (
import_dataset_view,
list_dataset_files_view,
list_datasets_view,
+ remove_dataset_view,
unlink_file_view,
)
from renku.service.views.jobs import JOBS_BLUEPRINT_TAG, jobs_blueprint, list_jobs
@@ -137,6 +138,7 @@ def build_routes(app):
docs.register(create_dataset_view, blueprint=DATASET_BLUEPRINT_TAG)
docs.register(import_dataset_view, blueprint=DATASET_BLUEPRINT_TAG)
docs.register(edit_dataset_view, blueprint=DATASET_BLUEPRINT_TAG)
+ docs.register(remove_dataset_view, blueprint=DATASET_BLUEPRINT_TAG)
docs.register(unlink_file_view, blueprint=DATASET_BLUEPRINT_TAG)
docs.register(list_jobs, blueprint=JOBS_BLUEPRINT_TAG)
|
fix(service): add datasets.remove to swagger docs (#<I>)
|
diff --git a/test/integration/OauthTest.php b/test/integration/OauthTest.php
index <HASH>..<HASH> 100755
--- a/test/integration/OauthTest.php
+++ b/test/integration/OauthTest.php
@@ -54,6 +54,9 @@ class OauthTestCase extends TaoPhpUnitTestRunner
$this->oauthCustomer->delete();
}
+ /**
+ * @doesNotPerformAssertions
+ */
public function testSignature()
{
$request = new common_http_Request('http://example.com/oauthtest');
|
add doesNotPerformAssertions
|
diff --git a/lib/xclarity_client/switch_management.rb b/lib/xclarity_client/switch_management.rb
index <HASH>..<HASH> 100644
--- a/lib/xclarity_client/switch_management.rb
+++ b/lib/xclarity_client/switch_management.rb
@@ -29,9 +29,8 @@ module XClarityClient
else
connection(BASE_URI)
end
- puts "HEEEEEY #{response.body}"
- body = JSON.parse(response.body) rescue {}
+ body = JSON.parse(response.body)
body.map do |switch|
Switch.new switch
end
|
[/Switches] Fixing client errors
|
diff --git a/request.go b/request.go
index <HASH>..<HASH> 100644
--- a/request.go
+++ b/request.go
@@ -19,7 +19,7 @@ func newRequest(url string, method string, params ...interface{}) (*http.Request
}
request.Header.Set("Content-Type", "text/xml")
- request.Header.Set("Content-Lenght", fmt.Sprintf("%d", len(body)))
+ request.Header.Set("Content-Length", fmt.Sprintf("%d", len(body)))
return request, nil
}
|
Correct spelling of Content-Length header.
|
diff --git a/lib/discordrb/bot.rb b/lib/discordrb/bot.rb
index <HASH>..<HASH> 100644
--- a/lib/discordrb/bot.rb
+++ b/lib/discordrb/bot.rb
@@ -935,6 +935,10 @@ module Discordrb
v#{GATEWAY_VERSION} #{packet}"
invalidate_session
LOGGER.warn 'Session invalidated! All bets are off now.'
+
+ LOGGER.debug 'Reconnecting with IDENTIFY'
+ websocket_open # Since we just invalidated the session, pretending we just opened the WS again will re-identify
+ LOGGER.debug "Re-identified! Let's hope everything works fine."
return
end
|
Re-identify after invalidating the session because of an op9
|
diff --git a/checker/tests/result_test.py b/checker/tests/result_test.py
index <HASH>..<HASH> 100644
--- a/checker/tests/result_test.py
+++ b/checker/tests/result_test.py
@@ -56,6 +56,7 @@ class OTSTest(TestCase):
name = __name__
path = '.'
+ @tags('required',)
def test_ots(self):
""" Is TTF file correctly sanitized for Firefox and Chrome """
stdout = prun('{0} {1}'.format(app.config['OTS_BINARY_PATH'], self.path),
|
test for ots is blocker
|
diff --git a/header.go b/header.go
index <HASH>..<HASH> 100644
--- a/header.go
+++ b/header.go
@@ -69,9 +69,7 @@ func FormTagHeader() []byte {
// Size
// Function setSize in tag.go writes actual size of tag
- for i := 0; i < 4; i++ {
- b.WriteByte(0)
- }
+ b.Write([]byte{0, 0, 0, 0})
bytesBufPool.Put(b)
return b.Bytes()
|
* Use array of bytes instead of loop in FormTagHeader
|
diff --git a/src/pandas_profiling/model/typeset.py b/src/pandas_profiling/model/typeset.py
index <HASH>..<HASH> 100644
--- a/src/pandas_profiling/model/typeset.py
+++ b/src/pandas_profiling/model/typeset.py
@@ -211,10 +211,12 @@ def typeset_types(config: Settings) -> Set[visions.VisionsBaseType]:
def is_timedependent(series: pd.Series) -> bool:
autocorrelation_threshold = config.vars.timeseries.autocorrelation
lags = config.vars.timeseries.lags
- for lag in lags:
- autcorr = series.autocorr(lag=lag)
- if autcorr >= autocorrelation_threshold:
- return True
+ with warnings.catch_warnings():
+ warnings.simplefilter("ignore", RuntimeWarning)
+ for lag in lags:
+ autcorr = series.autocorr(lag=lag)
+ if autcorr >= autocorrelation_threshold:
+ return True
return False
|
feat: filter autocorrelation expected warnings
|
diff --git a/speech_therapist.js b/speech_therapist.js
index <HASH>..<HASH> 100644
--- a/speech_therapist.js
+++ b/speech_therapist.js
@@ -158,7 +158,16 @@ macros.macroexpand = function (name) {
}
macros.defmacro = function (name, arglist, body) {
- macros[name] = eval (macros.lambda (arglist, body))
+ try {
+ macros[name] = eval (macros.lambda.apply (
+ undefined,
+ Array.prototype.slice.call (arguments, 1)
+ ))
+ } catch (e) {
+ sys.puts ("error in parsing macro " + name + ":")
+ sys.puts (indent (macros.lambda (arglist, body)))
+ throw e
+ }
}
var joinWith = function (string) {
|
[ better error reporting on failed macros ]
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ from setuptools import setup, find_packages
setup(
name="sentry-sdk",
- version="0.1.0-preview15",
+ version="0.1.0-preview16",
author="Sentry Team and Contributors",
author_email="hello@getsentry.com",
url="https://github.com/getsentry/sentry-python",
|
release: <I>-preview<I>
|
diff --git a/mobanfile.py b/mobanfile.py
index <HASH>..<HASH> 100644
--- a/mobanfile.py
+++ b/mobanfile.py
@@ -12,6 +12,8 @@ from moban.utils import merge, parse_targets, git_clone
from moban.utils import expand_directories, pip_install
from moban.copier import Copier
+KNOWN_DOMAIN_FOR_GIT = ["github.com", "gitlab.com", "bitbucket.com"]
+
def find_default_moban_file():
for moban_file in constants.DEFAULT_MOBAN_FILES:
@@ -151,8 +153,10 @@ def handle_requires(requires):
def is_repo(require):
- return require.startswith("http") and (
- "github.com" in require
- or "gitlab.com" in require
- or "bitbucket.com" in require
- )
+ one_of_the_domain = False
+ for domain in KNOWN_DOMAIN_FOR_GIT:
+ if domain in require:
+ one_of_the_domain = True
+ break
+
+ return require.startswith("http") and one_of_the_domain
|
:hammer: code refactoring
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -2,10 +2,11 @@ from setuptools import setup
setup(
name='aufmachen',
- version='0.1-dev',
+ version='0.2.1',
url='http://github.com/fdb/aufmachen',
license='BSD',
author='Frederik & Jan De Bleser',
+ author_email='frederik@burocrazy.com',
description='Turns a website\'s HTML into nice, clean objects.',
packages=['aufmachen', 'aufmachen.websites'],
package_data = {'aufmachen': ['*.js']},
|
Change version number, add author email.
|
diff --git a/utility/src/test/java/com/networknt/utility/HashUtilTest.java b/utility/src/test/java/com/networknt/utility/HashUtilTest.java
index <HASH>..<HASH> 100644
--- a/utility/src/test/java/com/networknt/utility/HashUtilTest.java
+++ b/utility/src/test/java/com/networknt/utility/HashUtilTest.java
@@ -20,4 +20,12 @@ public class HashUtilTest {
Assert.assertTrue(HashUtil.validatePassword(password, hashedPass));
}
+ @Test
+ public void testClientSecretHash() throws Exception {
+ String secret = "f6h1FTI8Q3-7UScPZDzfXA";
+ String hashedPass = HashUtil.generateStorngPasswordHash(secret);
+ System.out.println("hashedSecret = " + hashedPass);
+ Assert.assertTrue(HashUtil.validatePassword(secret, hashedPass));
+ }
+
}
|
update test case to generate ahash for client secret
|
diff --git a/src/notebook/epics/execute.js b/src/notebook/epics/execute.js
index <HASH>..<HASH> 100644
--- a/src/notebook/epics/execute.js
+++ b/src/notebook/epics/execute.js
@@ -218,10 +218,7 @@ export function executeCellObservable(channels, id, code) {
.filter(payload => payload.source === 'set_next_input');
// All child messages for the cell
- const cellMessages = iopub
- .filter(msg =>
- executeRequest.header.msg_id === msg.parent_header.msg_id
- );
+ const cellMessages = iopub.childOf(executeRequest);
const cellAction$ = Rx.Observable.merge(
Rx.Observable.of(updateCellStatus(id, 'busy')),
|
refactor(execute): compose children messages using childOf
|
diff --git a/neurom/io/utils.py b/neurom/io/utils.py
index <HASH>..<HASH> 100644
--- a/neurom/io/utils.py
+++ b/neurom/io/utils.py
@@ -38,6 +38,7 @@ from . import load_data
from . import check
from neurom.utils import memoize
import os
+from collections import deque
@memoize
|
rabase changes
Revert "removed collections"
This reverts commit 1e1f<I>da3bbc2bb0c9bd<I>ec<I>b9be<I>c.
minor change
segment radial dists test
moved the specialized iterator inside the _impl feature
segment radial dists test
moved the specialized iterator inside the _impl feature
|
diff --git a/rest_auth/serializers.py b/rest_auth/serializers.py
index <HASH>..<HASH> 100644
--- a/rest_auth/serializers.py
+++ b/rest_auth/serializers.py
@@ -220,7 +220,7 @@ class PasswordResetConfirmSerializer(serializers.Serializer):
return attrs
def save(self):
- self.set_password_form.save()
+ return self.set_password_form.save()
class PasswordChangeSerializer(serializers.Serializer):
|
return user object from upstream method invocation
|
diff --git a/src/Fixture/FixtureSet.php b/src/Fixture/FixtureSet.php
index <HASH>..<HASH> 100644
--- a/src/Fixture/FixtureSet.php
+++ b/src/Fixture/FixtureSet.php
@@ -29,7 +29,7 @@ class FixtureSet implements \IteratorAggregate
public function getLastModified()
{
- if (null === $this->lastModified) {
+ if (null === $this->lastModified && count($this->classes) > 0) {
$mtimes = array();
foreach ($this->classes as $class) {
|
Return null for last modified if no fixtures are available
|
diff --git a/tests/junit/org/jgroups/tests/ReconciliationTest.java b/tests/junit/org/jgroups/tests/ReconciliationTest.java
index <HASH>..<HASH> 100644
--- a/tests/junit/org/jgroups/tests/ReconciliationTest.java
+++ b/tests/junit/org/jgroups/tests/ReconciliationTest.java
@@ -31,9 +31,9 @@ import org.testng.annotations.Test;
* configured to use FLUSH
*
* @author Bela Ban
- * @version $Id: ReconciliationTest.java,v 1.10 2008/05/13 10:35:07 vlada Exp $
+ * @version $Id: ReconciliationTest.java,v 1.11 2008/05/20 16:01:59 belaban Exp $
*/
-@Test(groups="temp",sequential=true)
+@Test(groups=Global.FLUSH,sequential=true)
public class ReconciliationTest extends ChannelTestBase {
private List<JChannel> channels;
|
changed group from temp to FLUSH
|
diff --git a/src/Charcoal/Admin/Widget/AttachmentWidget.php b/src/Charcoal/Admin/Widget/AttachmentWidget.php
index <HASH>..<HASH> 100644
--- a/src/Charcoal/Admin/Widget/AttachmentWidget.php
+++ b/src/Charcoal/Admin/Widget/AttachmentWidget.php
@@ -598,9 +598,10 @@ class AttachmentWidget extends AdminWidget implements
$formIdent = $attMeta['form_ident'];
}
- if (isset($attMeta['quick_form_ident'])) {
- $quickFormIdent = $attMeta['quick_form_ident'];
- }
+ $quickFormIdent = !$quickFormIdent && isset($attMeta['quick_form_ident'])
+ ? $attMeta['quick_form_ident'] : $quickFormIdent;
+ $quickFormIdent = !$quickFormIdent && isset($attMeta['quickFormIdent'])
+ ? $attMeta['quickFormIdent'] : $quickFormIdent;
if (isset($attMeta['fa_icon']) && !empty($attMeta['fa_icon'])) {
$faIcon = $attMeta['fa_icon'];
|
Fixed quickFormIdent not being set depending on camel or snake case
|
diff --git a/lib/logue/version.rb b/lib/logue/version.rb
index <HASH>..<HASH> 100755
--- a/lib/logue/version.rb
+++ b/lib/logue/version.rb
@@ -2,5 +2,5 @@
# -*- ruby -*-
module Logue
- VERSION = '1.0.17'
+ VERSION = '1.0.18'
end
|
Fix reference to whence file, which is now the file name instead of 'eval'
|
diff --git a/seleniumbase/fixtures/base_case.py b/seleniumbase/fixtures/base_case.py
index <HASH>..<HASH> 100755
--- a/seleniumbase/fixtures/base_case.py
+++ b/seleniumbase/fixtures/base_case.py
@@ -1376,7 +1376,7 @@ class BaseCase(unittest.TestCase):
timeout = self._get_new_timeout(timeout)
is_ready = page_actions.wait_for_ready_state_complete(self.driver,
timeout)
- self.wait_for_angularjs()
+ self.wait_for_angularjs(timeout=settings.MINI_TIMEOUT)
return is_ready
def wait_for_angularjs(self, timeout=settings.LARGE_TIMEOUT, **kwargs):
|
If waiting for angularjs to load as part of ready state, wait less time
|
diff --git a/tests/TestCase/Utility/Validate/Check/ViewsCheckTest.php b/tests/TestCase/Utility/Validate/Check/ViewsCheckTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/Utility/Validate/Check/ViewsCheckTest.php
+++ b/tests/TestCase/Utility/Validate/Check/ViewsCheckTest.php
@@ -30,6 +30,12 @@ class ViewsCheckTest extends TestCase
$this->assertTrue(is_int($result), "run() returned a non-integer result");
}
+ public function testRunNonEmpty() : void
+ {
+ $result = $this->check->run('Foo');
+ $this->assertTrue(is_int($result), "run() returned a non-integer result");
+ }
+
public function testRunTooManyColumns() : void
{
Configure::write('CsvMigrations.actions', ['too_many_columns']);
|
Test non-empty file (task #<I>)
|
diff --git a/src/Ouzo/Goodies/Tests/StreamStub.php b/src/Ouzo/Goodies/Tests/StreamStub.php
index <HASH>..<HASH> 100644
--- a/src/Ouzo/Goodies/Tests/StreamStub.php
+++ b/src/Ouzo/Goodies/Tests/StreamStub.php
@@ -46,6 +46,12 @@ class StreamStub
return [];
}
+ public function stream_seek($offset, $whence)
+ {
+ static::$position = $offset;
+ return true;
+ }
+
public function stream_close()
{
return null;
|
Added seek to StreamStub.
|
diff --git a/course/editsection.php b/course/editsection.php
index <HASH>..<HASH> 100644
--- a/course/editsection.php
+++ b/course/editsection.php
@@ -50,12 +50,7 @@
$stredit = get_string('edit', '', " $sectionname");
$strsummaryof = get_string('summaryof', '', " $sectionname");
} else {
- /// Look for section name into specific course format lang file
- $sectionname = get_string("name$course->format", "format_$course->format");
- if ($sectionname == "[[name$course->format]]") {
- /// Section name not in course format lang file, go to default moodle file
- $sectionname = get_string("name$course->format");
- }
+ $sectionname = get_section_name($course->format);
$stredit = get_string('edit', '', " $sectionname $section->section");
$strsummaryof = get_string('summaryof', '', " $sectionname $form->section");
}
|
MDL-<I> course format - discovered the get_section_name() that performs the fallback harcoded in previous commit. Merged from <I>_STABLE
|
diff --git a/findbugs/src/java/edu/umd/cs/findbugs/ba/deref/UnconditionalValueDerefAnalysis.java b/findbugs/src/java/edu/umd/cs/findbugs/ba/deref/UnconditionalValueDerefAnalysis.java
index <HASH>..<HASH> 100644
--- a/findbugs/src/java/edu/umd/cs/findbugs/ba/deref/UnconditionalValueDerefAnalysis.java
+++ b/findbugs/src/java/edu/umd/cs/findbugs/ba/deref/UnconditionalValueDerefAnalysis.java
@@ -159,7 +159,7 @@ public class UnconditionalValueDerefAnalysis extends
if (DEBUG) {
System.out.println("XXX: " + handle.getPosition() + " " + handle.getInstruction());
}
- if (handle.getInstruction() instanceof ATHROW ) {
+ if (false && handle.getInstruction() instanceof ATHROW ) {
fact.clear();
fact.markAsOnExceptionPath();
}
|
turn this off; see what impact it has
git-svn-id: <URL>
|
diff --git a/src/cdp/transform.js b/src/cdp/transform.js
index <HASH>..<HASH> 100644
--- a/src/cdp/transform.js
+++ b/src/cdp/transform.js
@@ -89,8 +89,9 @@ module.exports = function transform(argv) {
await next();
// We need to remove the leading slash else it will be excluded by default
const url = ctx.url.substring(1);
- if (argv.instrument.testExclude.shouldInstrument(url) ||
- argv.transform.testExclude.shouldInstrument(url)) {
+ const shouldInstrument = argv.coverage && argv.instrument.testExclude.shouldInstrument(url);
+ const shouldTransform = argv.transform.testExclude.shouldInstrument(url);
+ if (shouldInstrument || shouldTransform) {
const { response } = ctx;
response.body = await transformFile(url, argv);
}
|
CDP - only instrument if `coverage` is thruthy
|
diff --git a/malcolm/core/methodmeta.py b/malcolm/core/methodmeta.py
index <HASH>..<HASH> 100644
--- a/malcolm/core/methodmeta.py
+++ b/malcolm/core/methodmeta.py
@@ -22,18 +22,12 @@ class MethodMeta(Meta):
def __init__(self, description="", tags=None, writeable=True, label=""):
super(MethodMeta, self).__init__(description, tags, writeable, label)
- self.func = None
self.set_takes(MapMeta())
self.set_returns(MapMeta())
self.set_defaults(OrderedDict())
# List of state names that we are writeable in
self.only_in = None
- def set_function(self, func):
- """Set the function to expose.
- """
- self.func = func
-
def set_takes(self, takes, notify=True):
"""Set the arguments and default values for the method
|
MethodMeta doesn't need a func any more
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.