diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/public_header.go b/public_header.go
index <HASH>..<HASH> 100644
--- a/public_header.go
+++ b/public_header.go
@@ -162,13 +162,10 @@ func ParsePublicHeader(b *bytes.Reader, packetSentBy protocol.Perspective) (*Pub
// see https://github.com/lucas-clemente/quic-go/issues/232
if !header.VersionFlag && !header.ResetFlag {
header.DiversificationNonce = make([]byte, 32)
- for i := 0; i < 32; i++ {
- var val byte
- val, err = b.ReadByte()
- if err != nil {
- return nil, err
- }
- header.DiversificationNonce[i] = val
+ // this Read can never return an EOF for a valid packet, since the diversification nonce is followed by the packet number
+ _, err = b.Read(header.DiversificationNonce)
+ if err != nil {
+ return nil, err
}
}
}
|
optimize reading of diversification nonces from the PublicHeader
|
diff --git a/src/Thujohn/Twitter/Twitter.php b/src/Thujohn/Twitter/Twitter.php
index <HASH>..<HASH> 100644
--- a/src/Thujohn/Twitter/Twitter.php
+++ b/src/Thujohn/Twitter/Twitter.php
@@ -430,6 +430,11 @@ class Twitter extends tmhOAuth {
return 'https://twitter.com/intent/favorite?tweet_id=' . $tweet->id_str;
}
+ public function linkReply($tweet)
+ {
+ return 'https://twitter.com/intent/tweet?in_reply_to=' . $tweet->id_str;
+ }
+
private function jsonDecode($json, $assoc = false)
{
if (version_compare(PHP_VERSION, '5.4.0', '>=') && !(defined('JSON_C_VERSION') && PHP_INT_SIZE > 4))
|
Add linkReply method to get reply url.
|
diff --git a/test/base/options.js b/test/base/options.js
index <HASH>..<HASH> 100644
--- a/test/base/options.js
+++ b/test/base/options.js
@@ -108,4 +108,10 @@ describe ('neural network constructor values', () => {
var net = new brain.NeuralNetwork(opts);
assert.equal(opts.activation, net.activation, `activation => ${net.activation} but should be ${opts.activation}`);
})
+
+ it('leakyReluAlpha should be settable in the constructor', () => {
+ let opts = { leakyReluAlpha: 0.1337 };
+ var net = new brain.NeuralNetwork(opts);
+ assert.equal(opts.leakyReluAlpha, net.leakyReluAlpha, `leakyReluAlpha => ${net.leakyReluAlpha} but should be ${opts.leakyReluAlpha}`);
+ })
});
\ No newline at end of file
|
Added basic test for leakyReluAlpha option
|
diff --git a/src/Dots.js b/src/Dots.js
index <HASH>..<HASH> 100644
--- a/src/Dots.js
+++ b/src/Dots.js
@@ -3,10 +3,10 @@ import { Paper } from 'material-ui'
const styles = {
dot: {
- width: 10,
- height: 10,
+ width: 8,
+ height: 8,
background: '#fff',
- margin: '0 3px',
+ margin: '0 4px',
float: 'left',
transition: 'all 400ms cubic-bezier(0.4, 0.0, 0.2, 1)'
}
|
Adjust size and spacing of the dots according to specs.
|
diff --git a/modules/ircbee/ircbee.go b/modules/ircbee/ircbee.go
index <HASH>..<HASH> 100644
--- a/modules/ircbee/ircbee.go
+++ b/modules/ircbee/ircbee.go
@@ -115,10 +115,10 @@ func (sys *IrcBee) Action(action modules.Action) bool {
case "send":
for _, opt := range action.Options {
if opt.Name == "channel" {
- tos = append(tos, opt.Value)
+ tos = append(tos, opt.Value.(string))
}
if opt.Name == "text" {
- text = opt.Value
+ text = opt.Value.(string)
}
}
default:
diff --git a/modules/modules.go b/modules/modules.go
index <HASH>..<HASH> 100644
--- a/modules/modules.go
+++ b/modules/modules.go
@@ -38,7 +38,7 @@ type Placeholder struct {
Name string
Description string
Type string
- Value string
+ Value interface{}
}
var (
|
* Placeholder's value needs be an interface{}, so we can stuff arbitrary content in it.
|
diff --git a/js/cloudmine.js b/js/cloudmine.js
index <HASH>..<HASH> 100644
--- a/js/cloudmine.js
+++ b/js/cloudmine.js
@@ -60,7 +60,7 @@
*/
var apply_params = function(url, opts){
var params = {};
- var valid_params = ["f", "count", "skip", "limit"];
+ var valid_params = ["f", "count", "skip", "limit", "params"];
var param;
for(var index in valid_params){
if(valid_params.hasOwnProperty(index)){
|
added "params" to valid params list
|
diff --git a/src/main/java/org/telegram/botapi/api/TelegramBot.java b/src/main/java/org/telegram/botapi/api/TelegramBot.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/telegram/botapi/api/TelegramBot.java
+++ b/src/main/java/org/telegram/botapi/api/TelegramBot.java
@@ -361,12 +361,9 @@ public final class TelegramBot {
return messageResponse != null ? messageResponse : MessageImpl.createMessage(jsonResponse != null ? jsonResponse.getObject() : null);
}
- public void setUpdateMethod(UpdateManager.UpdateMethod updateMethod) {
+ public void startUpdates() {
- if(updateMethod.equals(UpdateManager.UpdateMethod.REQUEST_UPDATES)) {
-
- updateManager = new RequestUpdatesManager(this);
- }
+ updateManager = new RequestUpdatesManager(this);
}
public ListenerRegistry getEventsManager() {
|
Change the setUpdateMethod method to startUpdates without any arguments.
|
diff --git a/src/frontend/org/voltcore/logging/VoltLogger.java b/src/frontend/org/voltcore/logging/VoltLogger.java
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltcore/logging/VoltLogger.java
+++ b/src/frontend/org/voltcore/logging/VoltLogger.java
@@ -126,6 +126,7 @@ public class VoltLogger {
} catch (Exception e) {
Throwables.propagate(e);
}
+ break;
default:
throw new AssertionError("Unrecognized level " + level);
}
|
For ENG-<I>, bring back missing break
|
diff --git a/NavigationReactMobile/sample/twitter/createStateNavigator.js b/NavigationReactMobile/sample/twitter/createStateNavigator.js
index <HASH>..<HASH> 100644
--- a/NavigationReactMobile/sample/twitter/createStateNavigator.js
+++ b/NavigationReactMobile/sample/twitter/createStateNavigator.js
@@ -15,9 +15,10 @@ export default () => {
{key: 'photo', trackCrumbTrail: true}
], new MobileHistoryManager(url => {
var {state, data} = stateNavigator.parseLink(url);
- return stateNavigator.fluent()
- .navigate('home')
- .navigate(state.key, data).url;
+ var fluent = stateNavigator.fluent().navigate('home');
+ if (state.key === 'photo')
+ fluent = fluent.navigate('tweet', {id: data.id})
+ return fluent.navigate(state.key, data).url;
}));
const {home, tweet, timeline, photo} = stateNavigator.states;
|
Navigated home -> tweet -> photo on start
If photo bookmarked then X should go back to tweet that owns the photo and then to home
|
diff --git a/nosedjango/nosedjango.py b/nosedjango/nosedjango.py
index <HASH>..<HASH> 100644
--- a/nosedjango/nosedjango.py
+++ b/nosedjango/nosedjango.py
@@ -14,7 +14,9 @@ import nose.case
# search the current working directory and all parent directories to find
# the settings file
from nose.importer import add_path
-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+if not 'DJANGO_SETTINGS_MODULE' in os.environ:
+ os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+
import re
NT_ROOT = re.compile(r"^[a-zA-Z]:\\$")
def get_SETTINGS_PATH():
@@ -22,8 +24,11 @@ def get_SETTINGS_PATH():
Hunt down the settings.py module by going up the FS path
'''
cwd = os.getcwd()
+ settings_filename = '%s.py' % (
+ os.environ['DJANGO_SETTINGS_MODULE'].split('.')[-1]
+ )
while cwd:
- if 'settings.py' in os.listdir(cwd):
+ if settings_filename in os.listdir(cwd):
break
cwd = os.path.split(cwd)[0]
if os.name == 'nt' and NT_ROOT.match(cwd):
|
Support custom named setttings.py files
|
diff --git a/src/brackets.js b/src/brackets.js
index <HASH>..<HASH> 100644
--- a/src/brackets.js
+++ b/src/brackets.js
@@ -14,10 +14,15 @@ $(document).ready(function() {
value: 'var myResponse="Yes, it will be!"\n'
});
+ // Load a default project into the tree
if (brackets.inBrowser) {
+ // In browser: dummy folder tree (hardcoded in ProjectManager)
ProjectManager.loadProject("DummyProject");
} else {
- // TODO: what is default project when in app shell ??
+ // In app shell: load Brackets itself
+ var loadedPath = window.location.pathname;
+ var bracketsSrc = loadedPath.substr(0, loadedPath.lastIndexOf("/"));
+ ProjectManager.loadProject(bracketsSrc);
}
$("#btn-open-project").click(function() {
|
Set up Brackets so it loads its own src code by
default (if outside of appshell, it still uses
hardcoded dummy data instead).
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ class DiscoverTest(Command):
setup(
name='isc_dhcp_leases',
- version='0.4.0',
+ version='0.4.1',
packages=['isc_dhcp_leases'],
url='https://github.com/MartijnBraam/python-isc-dhcp-leases',
license='MIT',
|
Released <I> with IPv6 bugfixes
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,18 +1,24 @@
from setuptools import setup
+try:
+ import pypandoc
+ long_description = pypandoc.convert('README.md', 'rst', 'markdown')
+except (ImportError, FileNotFoundError, RuntimeError):
+ #ImportError: pypandoc failed to import
+ #FileNotFoundError: couldn't launch pandoc
+ #RuntimeError: failed to convert
+ long_description = open('README.md').read()
+
setup(
name="Dispatching",
version="1.0.1",
py_modules=['dispatching',],
test_suite='test',
platforms='any',
- package_data={
- '': ['README.md', 'LICENSE',],
- },
author="Nathan West",
description="A library for overloading python functions",
- long_description=open('README.md').read(),
+ long_description=long_description,
license="LGPLv3",
url="https://github.com/Lucretiel/Dispatch",
|
setup.py now uses pypandoc
* setup.py now attempts to use pypandoc to convert README.md to rst
for pypi
|
diff --git a/thehive4py/helpers.py b/thehive4py/helpers.py
index <HASH>..<HASH> 100644
--- a/thehive4py/helpers.py
+++ b/thehive4py/helpers.py
@@ -1,4 +1,10 @@
import datetime as dt
+import time
+
+
+def now_to_ts() -> int:
+ """Return now as TheHive timestamp."""
+ return int(time.time() * 1000)
def dt_to_ts(datetime: dt.datetime) -> int:
|
Add now to timestamp helper
|
diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/EntityTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/EntityTest.java
index <HASH>..<HASH> 100755
--- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/EntityTest.java
+++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/EntityTest.java
@@ -37,7 +37,7 @@ import org.synchronoss.cpo.meta.domain.CpoAttribute;
*/
public class EntityTest extends TestCase {
- private static Logger logger = LoggerFactory.getLogger(BlobTest.class.getName());
+ private static Logger logger = LoggerFactory.getLogger(EntityTest.class.getName());
public EntityTest(String name) {
super(name);
|
Fixed the logger static to be correct
|
diff --git a/torrent.go b/torrent.go
index <HASH>..<HASH> 100644
--- a/torrent.go
+++ b/torrent.go
@@ -204,7 +204,7 @@ func (t *Torrent) addrActive(addr string) bool {
return false
}
-func (t *Torrent) worstUnclosedConns() (ret []*connection) {
+func (t *Torrent) unclosedConnsAsSlice() (ret []*connection) {
ret = make([]*connection, 0, len(t.conns))
for c := range t.conns {
if !c.closed.IsSet() {
@@ -758,7 +758,8 @@ func (t *Torrent) wantPieceIndex(index int) bool {
// pieces, or has been in worser half of the established connections for more
// than a minute.
func (t *Torrent) worstBadConn() *connection {
- wcs := worseConnSlice{t.worstUnclosedConns()}
+ wcs := worseConnSlice{t.unclosedConnsAsSlice()}
+ heap.Init(&wcs)
for wcs.Len() != 0 {
c := heap.Pop(&wcs).(*connection)
if c.UnwantedChunksReceived >= 6 && c.UnwantedChunksReceived > c.UsefulChunksReceived {
|
It looks like Torrent.worstBadConn was returning an arbitrary bad connection, it wasn't the worst
heap.Init got lost somewhere along the way? Need a unit test for this.
|
diff --git a/src/Engine/Elasticsearch/ElasticsearchClient.php b/src/Engine/Elasticsearch/ElasticsearchClient.php
index <HASH>..<HASH> 100644
--- a/src/Engine/Elasticsearch/ElasticsearchClient.php
+++ b/src/Engine/Elasticsearch/ElasticsearchClient.php
@@ -45,6 +45,8 @@ class ElasticsearchClient
$this->method = self::METHOD_GET;
$this->executeCurlRequest();
+
+ return $this;
}
public function setIndex($value)
@@ -71,6 +73,16 @@ class ElasticsearchClient
return $this;
}
+ public function getResponse()
+ {
+ return $this->getDecodedResponse()['hits'];
+ }
+
+ public function getTotalItemsCount()
+ {
+ return $this->getResponse()['total'];
+ }
+
private function executeCurlRequest()
{
$handle = curl_init((string) $this->url);
@@ -90,4 +102,9 @@ class ElasticsearchClient
return $this;
}
+
+ private function getDecodedResponse()
+ {
+ return json_decode($this->response, true);
+ }
}
|
<I> - Added method which decodes json response from elasticsearch.
|
diff --git a/scripts/install.js b/scripts/install.js
index <HASH>..<HASH> 100644
--- a/scripts/install.js
+++ b/scripts/install.js
@@ -53,4 +53,4 @@ var uglifyConfigFile = fs.readFileSync(path.join(__dirname, '../uglify-config.js
fs.writeFileSync(path.join(paths[0], 'uglify-config.json'), uglifyConfigFile);
console.log('Updating hooks directory to have execution permissions...');
-shell.chmod('-R', 755, paths[0]);
+shell.chmod('-R', 'a+x', path.join(paths[1], 'uglify.js'));
|
execution permissions: only chmod +x uglify.js
When installing this package, it shouldn't change the execution permission of all the files in hooks/ but rather only uglify.js.
|
diff --git a/lib/go/thrift/simple_server.go b/lib/go/thrift/simple_server.go
index <HASH>..<HASH> 100644
--- a/lib/go/thrift/simple_server.go
+++ b/lib/go/thrift/simple_server.go
@@ -221,7 +221,9 @@ func treatEOFErrorsAsNil(err error) error {
if err == nil {
return nil
}
- if err == io.EOF {
+ // err could be io.EOF wrapped with TProtocolException,
+ // so that err == io.EOF doesn't necessarily work in some cases.
+ if err.Error() == io.EOF.Error() {
return nil
}
if err, ok := err.(TTransportException); ok && err.TypeId() == END_OF_FILE {
|
THRIFT-<I>: Handle wrapped io.EOF errors
TCompactProtocol (which is used by THeaderTransport to read headers)
could wrap the underlying error with TProtocolException, which breaks
err == io.EOF test in some cases.
Client: go
This closes #<I>.
|
diff --git a/custom-rating-grifus.php b/custom-rating-grifus.php
index <HASH>..<HASH> 100644
--- a/custom-rating-grifus.php
+++ b/custom-rating-grifus.php
@@ -13,7 +13,7 @@ return [
'id' => 'CustomRatingGrifus',
'name' => 'Custom Rating',
- 'version' => '1.0.0',
+ 'version' => '1.0.1',
'description' => __('Replaces IMDB rating by your own rating system.', 'extensions-for-grifus'),
'state' => 'uninstalled',
'category' => 'wp-plugin-extension',
|
Updated to <I> version
|
diff --git a/src/Cli.php b/src/Cli.php
index <HASH>..<HASH> 100644
--- a/src/Cli.php
+++ b/src/Cli.php
@@ -13,7 +13,8 @@ use Joomla\Filter;
/**
* Joomla! Input CLI Class
*
- * @since 1.0
+ * @since 1.0
+ * @deprecated 2.0 Use a Symfony\Component\Console\Input\InputInterface implementation when using the `joomla/console` package
*/
class Cli extends Input
{
|
Deprecate CLI subclass support in favor of symfony/console API
|
diff --git a/src/processor.js b/src/processor.js
index <HASH>..<HASH> 100644
--- a/src/processor.js
+++ b/src/processor.js
@@ -440,6 +440,7 @@ function processRoom(roomId, {intents, roomObjects, users, roomTerrain, gameTime
//userVisibility[object.user] = true;
if(object.type != 'constructionSite' && !object.newbieWall &&
+ object.type != 'ruin' && object.type != 'tombstone' &&
(object.type != 'rampart' || !object.isPublic)) {
mapView[object.user] = mapView[object.user] || [];
mapView[object.user].push([object.x, object.y]);
|
refact(processor): exclude ruins and tombstones from map view
|
diff --git a/tests/hooks/test_hive_hook.py b/tests/hooks/test_hive_hook.py
index <HASH>..<HASH> 100644
--- a/tests/hooks/test_hive_hook.py
+++ b/tests/hooks/test_hive_hook.py
@@ -208,7 +208,7 @@ class TestHiveMetastoreHook(HiveEnvironmentTest):
pattern=self.table + "*")
self.assertIn(self.table, {table.tableName for table in tables})
- def get_databases(self):
+ def test_get_databases(self):
databases = self.hook.get_databases(pattern='*')
self.assertIn(self.database, databases)
|
[AIRFLOW-<I>] Fix TestHiveMetastoreHook to run all cases
TestHiveMetastoreHook has a method which name
doesn't start with test_. This PR renames it
to be executed.
Closes #<I> from sekikn/AIRFLOW-<I>
|
diff --git a/tests/unit/DynamicActiveQueryTest.php b/tests/unit/DynamicActiveQueryTest.php
index <HASH>..<HASH> 100644
--- a/tests/unit/DynamicActiveQueryTest.php
+++ b/tests/unit/DynamicActiveQueryTest.php
@@ -83,6 +83,24 @@ class DynamicActiveQueryTest extends DatabaseTestCase
}
}
+ public function testNestedTypesProcessing()
+ {
+ // it's enough to just check select - logic is similar for the whole sql query
+ $query = new DynamicActiveQuery(Product::className());
+
+ foreach ($this->types() as $k => $possibleTypes) {
+ foreach ($possibleTypes as $type) {
+ $query->select(["{test.child|$type}"]);
+ $command = $query->createCommand();
+
+ $sql = $command->getRawSql();
+ $this->assertNotContains("{test|$type}", $sql,
+ "Type $type should be processed, there shouldn't be any user's dynamic queries");
+ $this->assertContains("as $type", $sql, "Type $type should be processed", true);
+ }
+ }
+ }
+
private function types()
{
return [
|
added test for nested attr recognizing
|
diff --git a/algoliasearch/src/offline/java/com/algolia/search/saas/OfflineIndex.java b/algoliasearch/src/offline/java/com/algolia/search/saas/OfflineIndex.java
index <HASH>..<HASH> 100644
--- a/algoliasearch/src/offline/java/com/algolia/search/saas/OfflineIndex.java
+++ b/algoliasearch/src/offline/java/com/algolia/search/saas/OfflineIndex.java
@@ -599,7 +599,7 @@ public class OfflineIndex {
* @param completionHandler Completion handler to be notified of the transaction's outcome.
* @return A cancellable operation (see warning for important caveat).
*/
- public Request rollbackTransactionAsync(@NonNull CompletionHandler completionHandler) {
+ public Request rollbackTransactionAsync(CompletionHandler completionHandler) {
assertTransaction();
return getClient().new AsyncTaskRequest(completionHandler, getClient().transactionExecutorService) {
@NonNull
|
[offline] Make completion handler mandatory on transaction rollback
|
diff --git a/lib/hammer_cli_katello/content_view_version.rb b/lib/hammer_cli_katello/content_view_version.rb
index <HASH>..<HASH> 100644
--- a/lib/hammer_cli_katello/content_view_version.rb
+++ b/lib/hammer_cli_katello/content_view_version.rb
@@ -18,7 +18,9 @@ module HammerCLIKatello
version
end
- build_options
+ build_options do |o|
+ o.expand(:all).including(:organizations)
+ end
end
class InfoCommand < HammerCLIKatello::InfoCommand
@@ -55,7 +57,7 @@ module HammerCLIKatello
end
build_options do |o|
- o.expand(:all).including(:environments, :content_views)
+ o.expand(:all).including(:environments, :content_views, :organizations)
end
end
@@ -110,7 +112,7 @@ module HammerCLIKatello
failure_message _("Could not delete the content view")
build_options do |o|
- o.expand(:all).including(:environments, :content_views)
+ o.expand(:all).including(:environments, :content_views, :organizations)
end
end
|
refs #<I> - add org back to content-view version commands, bz <I>
|
diff --git a/src/Chronos/Scaffolding/config/defaults.php b/src/Chronos/Scaffolding/config/defaults.php
index <HASH>..<HASH> 100644
--- a/src/Chronos/Scaffolding/config/defaults.php
+++ b/src/Chronos/Scaffolding/config/defaults.php
@@ -2,7 +2,7 @@
return [
- 'version' => '2.2.18',
+ 'version' => '2.2.19',
'alerts' => [
|
Fixed issue with laravel/passport versioning
|
diff --git a/pyathena/result_set.py b/pyathena/result_set.py
index <HASH>..<HASH> 100644
--- a/pyathena/result_set.py
+++ b/pyathena/result_set.py
@@ -309,6 +309,7 @@ class AthenaPandasResultSet(AthenaResultSet):
)
if (
self.state == AthenaQueryExecution.STATE_SUCCEEDED
+ and self.output_location
and self.output_location.endswith((".csv", ".txt"))
):
self._df = self._as_pandas()
|
Fix Item "None" of "Optional[str]" has no attribute "endswith"
|
diff --git a/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenu.java b/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenu.java
index <HASH>..<HASH> 100644
--- a/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenu.java
+++ b/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenu.java
@@ -50,8 +50,10 @@ public class TryBlueOceanMenu extends TransientActionFactory<ModelObject> {
}
try {
((Actionable) target).replaceAction(a);
- }catch (UnsupportedOperationException e){
+ }catch (Throwable e){
//ignore, replace is not supported
+ //JENKINS-44964 sometimes replaceAction will fail because one of the actions inserted is null
+ //only seen in the wild when the maven plugin is available
}
return Collections.singleton(a);
}
|
JENKINS-<I> sometimes replaceAction will fail because an action in the list is null (#<I>)
|
diff --git a/packages/ember-metal/lib/platform.js b/packages/ember-metal/lib/platform.js
index <HASH>..<HASH> 100644
--- a/packages/ember-metal/lib/platform.js
+++ b/packages/ember-metal/lib/platform.js
@@ -183,6 +183,7 @@ if (!(Object.create && !Object.create(null).hasOwnProperty)) {
return object;
};
+ create.isSimulated = true;
} else {
create = Object.create;
}
|
[BUGFIX]fix Object.create sham for IE8
The `isSimulated` check was removed in
2fde5b7ee<I>be<I>c<I>bba<I>b0dcf<I>ba.
The `isSimulated` check is used internally by
Ember for things like Ember.keys(Object.keys) polyfill.
Github link:
<URL>
|
diff --git a/transformers/engine.io/client.js b/transformers/engine.io/client.js
index <HASH>..<HASH> 100644
--- a/transformers/engine.io/client.js
+++ b/transformers/engine.io/client.js
@@ -47,6 +47,13 @@ module.exports = function client() {
// Binary support in Engine.IO breaks a shit things. Turn it off for now.
//
forceBase64: true,
+
+ //
+ // Force timestamps on every single connection. Engine.IO only does this
+ // for polling by default, but WebSockets require an explicit `true`
+ // boolean.
+ //
+ timestampRequests: true,
path: this.pathname,
transports: !primus.AVOID_WEBSOCKETS
? ['polling', 'websocket']
@@ -54,7 +61,7 @@ module.exports = function client() {
}));
//
- // Nuke a growing memory leak as engine.io pushes instances in to an exposed
+ // Nuke a growing memory leak as Engine.IO pushes instances in to an exposed
// `sockets` array.
//
if (factory.sockets && factory.sockets.length) {
|
[fix] Force timestamped requests for engine.io
|
diff --git a/acceptance/tests/resource/file/symbolic_modes.rb b/acceptance/tests/resource/file/symbolic_modes.rb
index <HASH>..<HASH> 100644
--- a/acceptance/tests/resource/file/symbolic_modes.rb
+++ b/acceptance/tests/resource/file/symbolic_modes.rb
@@ -1,5 +1,8 @@
test_name "file resource: symbolic modes"
confine :except, :platform => /^eos-/ # See ARISTA-37
+confine :except, :platform => /^solaris-10/
+confine :except, :platform => /^windows/
+confine :to, {}, hosts.select { |host| ! host[:roles].include?('master') }
require 'puppet/acceptance/temp_file_utils'
extend Puppet::Acceptance::TempFileUtils
@@ -176,14 +179,6 @@ end
# permissions locked while a program is accessing that file.
#
agents.each do |agent|
- if agent['platform'].include?('windows')
- Log.warn("Pending: this does not currently work on Windows")
- next
- end
- if agent['platform'] =~ /solaris-10/
- Log.warn("Pending: this does not currently work on Solaris 10")
- next
- end
is_solaris = agent['platform'].include?('solaris')
on(agent, puppet("resource user symuser ensure=present"))
|
(PUP-<I>) Acceptance - no master in symbolic_modes
This commit confines hosts eligible to be included in the execution
of the `resource/file/symbolic_modes` test.
It removes the master from the hosts list.
It also moves the logic to exclude windows and solaris-<I> from
the body of the test and places them as confine statements at
the beginning.
|
diff --git a/digsandpaper/elasticsearch_mapping/generate.py b/digsandpaper/elasticsearch_mapping/generate.py
index <HASH>..<HASH> 100644
--- a/digsandpaper/elasticsearch_mapping/generate.py
+++ b/digsandpaper/elasticsearch_mapping/generate.py
@@ -58,7 +58,12 @@ def generate(default_mapping, semantic_types,
data_type = "string"
knowledge_graph[semantic_type] = kg_to_copy
semantic_type_props = {"high_confidence_keys": {"type": data_type,
- "index": "not_analyzed"}}
+ "index": "not_analyzed"},
+ "key_count": {"index": "no",
+ "type": "long"},
+ "provenance_count": {"index": "no",
+ "type": "long"},
+ }
if data_type in elasticsearch_numeric_types:
semantic_type_props["high_confidence_keys"]["ignore_malformed"] = True
root_props[semantic_type] = {"properties": semantic_type_props}
|
Don't index key_count and provenance_count
|
diff --git a/src/ORMServiceProvider.php b/src/ORMServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/ORMServiceProvider.php
+++ b/src/ORMServiceProvider.php
@@ -15,7 +15,7 @@ class ORMServiceProvider extends ServiceProvider
{
$this->publishes([
__DIR__ . '/../config/orm.php' => config_path('orm.php'),
- ], 'mongo');
+ ], 'orm');
}
/**
|
updated srvice provider tag
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -32,7 +32,9 @@ function buildProblemFilePath() {
function buildOnFinishedHandler(problemFilePath, callback) {
return function() {
- fs.unlink(problemFilePath);
+ ['.mzn', '.fzn', '.ozn'].forEach(function(ending) {
+ fs.unlink(problemFilePath.replace('.mzn', ending));
+ });
callback.apply(null, arguments);
};
}
|
Clean up all temporary files on failure
The solver creates some temporary files that should be deleted after
any execution, including timeouts.
|
diff --git a/lib/jsduck/doc/ast.rb b/lib/jsduck/doc/ast.rb
index <HASH>..<HASH> 100644
--- a/lib/jsduck/doc/ast.rb
+++ b/lib/jsduck/doc/ast.rb
@@ -95,7 +95,6 @@ module JsDuck
def create_css_mixin(docs, doc_map)
return add_shared({
:tagname => :css_mixin,
- :name => detect_name(:css_mixin, doc_map),
:doc => detect_doc(:css_mixin, doc_map),
}, doc_map)
end
|
Remove CSS mixin name detection from DocAst.
There is no @tag for CSS Mixins, and therefore no way to define
a mixin name inside documentation - it can only be derived from code.
|
diff --git a/test/test.js b/test/test.js
index <HASH>..<HASH> 100644
--- a/test/test.js
+++ b/test/test.js
@@ -94,7 +94,7 @@ describe("JSKOS JSON Schemas", () => {
let errorText =
!result
? `${type} ${object.uri} did not validate:
- ${validate[type].errors.reduce((t, c) => `${t}-${c.message}\n`, "")}`
+ ${validate[type].errors.reduce((t, c) => `${t}- ${c.dataPath} ${c.message}\n`, "")}`
: (expected ? "" : `${type} ${object.uri} passed even though it shouldn't.`)
assert.equal(result, expected, errorText)
}
|
Show data path for validation errors
Note: The tests currently fail because examples/jskos/mapping-ddc-gnd.json does not conform to the JSKOS specification.
|
diff --git a/medoo.php b/medoo.php
index <HASH>..<HASH> 100644
--- a/medoo.php
+++ b/medoo.php
@@ -815,7 +815,7 @@ class medoo
return $this->exec('UPDATE "' . $table . '" SET ' . $replace_query . $this->where_clause($where));
}
- public function get($table, $columns, $where = null)
+ public function get($table, $join = null, $column = null, $where = null)
{
if (!isset($where))
{
@@ -824,7 +824,7 @@ class medoo
$where['LIMIT'] = 1;
- $data = $this->select($table, $columns, $where);
+ $data = $this->query($this->select_context($table, $join, $column, $where))->fetchAll(PDO::FETCH_ASSOC);
return isset($data[0]) ? $data[0] : false;
}
|
[feature] Add table joining support for get API
|
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index <HASH>..<HASH> 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -226,6 +226,14 @@ class DatabaseTest extends \PHPUnit_Extensions_Database_TestCase
$this->assertTrue(false, 'Unknown exception');
}
$this->assertEmpty($badLangTest, 'Url should be empty, because of unexisting language');
+
+ $urlManager = Yii::$app->urlManager;
+ $this->assertEquals('/site/login', $urlManager->createUrl(['site/login']));
+ $this->assertEquals('/en/site/test', $urlManager->createUrl(['site/test']));
+ $urlManager->includeRoutes = ['site/included', 'site/another'];
+ $this->assertEquals('/site/test', $urlManager->createUrl(['site/test']));
+ $this->assertEquals('/en/site/included', $urlManager->createUrl(['site/included']));
+ $urlManager->includeRoutes = [];
}
/**
|
Test excludeRoutes + includeRoutes
|
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index <HASH>..<HASH> 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -233,6 +233,13 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin
func (u *Upgrade) performUpgrade(originalRelease, upgradedRelease *release.Release) (*release.Release, error) {
current, err := u.cfg.KubeClient.Build(bytes.NewBufferString(originalRelease.Manifest), false)
if err != nil {
+ // Checking for removed Kubernetes API error so can provide a more informative error message to the user
+ // Ref: https://github.com/helm/helm/issues/7219
+ if strings.Contains(err.Error(), "unable to recognize \"\": no matches for kind") {
+ return upgradedRelease, errors.Wrap(err, "current release manifest contains removed kubernetes api(s) for this "+
+ "kubernetes version and it is therefore unable to build the kubernetes "+
+ "objects for performing the diff. error from kubernetes")
+ }
return upgradedRelease, errors.Wrap(err, "unable to build kubernetes objects from current release manifest")
}
target, err := u.cfg.KubeClient.Build(bytes.NewBufferString(upgradedRelease.Manifest), !u.DisableOpenAPIValidation)
|
Add an improved user error message for removed k8s apis
The error message returned from Kubernetes when APIs are
removed is not very informative. This PR adds additional
information to the user. It covers the current release manifest
APIs.
Partial #<I>
|
diff --git a/src/ExprBuilder.php b/src/ExprBuilder.php
index <HASH>..<HASH> 100644
--- a/src/ExprBuilder.php
+++ b/src/ExprBuilder.php
@@ -21,7 +21,7 @@ class ExprBuilder implements ExpressionInterface
/**
* @param mixed $wrappedExpression
*/
- public function __construct($wrappedExpression)
+ public function __construct($wrappedExpression = null)
{
$this->wrappedExpression = Expr::normalizeExpression($wrappedExpression);
}
diff --git a/tests/Unit/QueryBuilderTest.php b/tests/Unit/QueryBuilderTest.php
index <HASH>..<HASH> 100644
--- a/tests/Unit/QueryBuilderTest.php
+++ b/tests/Unit/QueryBuilderTest.php
@@ -284,4 +284,14 @@ class QueryBuilderTest extends \PHPUnit_Framework_TestCase
static::assertSame('SELECT p.user_id, SUM(p.price) FROM price_list AS p GROUP BY p.user_id', $qb->buildSQL());
}
+
+ public function testAliasedSum()
+ {
+ $qb = $this->createQb();
+
+ $exampleTable = $qb->from('example');
+ $qb->addSelect($exampleTable->column('points')->sum()->alias('points'));
+
+ static::assertSame('SELECT SUM(example.points) AS points FROM example', $qb->buildSQL());
+ }
}
\ No newline at end of file
|
added test for aliasing expression
|
diff --git a/spec/lib/pwwka/error_handlers/chain_spec.rb b/spec/lib/pwwka/error_handlers/chain_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/pwwka/error_handlers/chain_spec.rb
+++ b/spec/lib/pwwka/error_handlers/chain_spec.rb
@@ -19,24 +19,14 @@ describe Pwwka::ErrorHandlers::Chain do
it "does not run subsequent error handlers" do
expect(good_error_handler_klass).to_not receive(:new)
- expect {
- chain.handle_error(double,double,double,double,double,double.as_null_object)
- }.to raise_error(SystemExit)
- end
-
- it "aborts the process" do
- expect {
- chain.handle_error(double,double,double,double,double,double.as_null_object)
- }.to raise_error(SystemExit)
+ chain.handle_error(double,double,double,double,double,double.as_null_object)
end
it "logs exceptions that occur in the error handling chain" do
- expect(chain.logger).to receive(:send).with(any_args).exactly(2).times
+ allow(chain.logger).to receive(:send).with(any_args)
expect(chain.logger).to receive(:send).with(:fatal, /aborting due to unhandled exception/)
- expect {
- chain.handle_error(double,double,double,double,double,double.as_null_object)
- }.to raise_error(SystemExit)
+ chain.handle_error(double,double,double,double,double,double.as_null_object)
end
end
end
|
Update Chain unit specs to handle halting the error handling chain instead of aborting the process
|
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,9 @@
module.exports = {
Headers: require('./Headers'),
Message: require('./Message'),
+ RequestLine: require('./RequestLine'),
HttpRequest: require('./HttpRequest'),
+ StatusLine: require('./StatusLine'),
HttpResponse: require('./HttpResponse'),
formatHeaderName: require('./formatHeaderName'),
foldHeaderLine: require('./foldHeaderLine')
|
Expose RequestLine and StatusLine on the exported object.
|
diff --git a/src/client/ui/controls.js b/src/client/ui/controls.js
index <HASH>..<HASH> 100644
--- a/src/client/ui/controls.js
+++ b/src/client/ui/controls.js
@@ -148,7 +148,7 @@ export default class StorybookControls extends React.Component {
textAlign: 'center',
borderRadius: '2px',
padding: '5px',
- cursor: 'default',
+ cursor: 'pointer',
margin: 0,
};
@@ -168,10 +168,18 @@ export default class StorybookControls extends React.Component {
left: '20px',
};
+ const linkStyle = {
+ textDecoration: 'none',
+ };
+
+ const linkTarget = 'https://github.com/kadirahq/react-storybook';
+
return (
<div style={mainStyle}>
<div style={h1WrapStyle}>
- <h3 style={h1Style}>React Storybook</h3>
+ <a style={linkStyle} href={linkTarget} target="_blank">
+ <h3 style={h1Style}>React Storybook</h3>
+ </a>
</div>
<div style={filterTextWrapStyle}>
<TextFilter
|
Link React Storybooks Menu to the Repo (#<I>)
* add repo link
* variable changes
|
diff --git a/ext_emconf.php b/ext_emconf.php
index <HASH>..<HASH> 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -16,7 +16,7 @@ $EM_CONF[$_EXTKEY] = array(
'modify_tables' => '',
'clearCacheOnLoad' => 1,
'lockType' => '',
- 'version' => '3.0.2',
+ 'version' => '3.1.0dev',
'constraints' => array(
'depends' => array(
'typo3' => '8.7.0-8.7.99',
|
set version to <I>dev
|
diff --git a/ImageCacheProvider.js b/ImageCacheProvider.js
index <HASH>..<HASH> 100644
--- a/ImageCacheProvider.js
+++ b/ImageCacheProvider.js
@@ -14,6 +14,7 @@ const SHA1 = require("crypto-js/sha1");
const URL = require('url-parse');
const defaultHeaders = {};
+const defaultImageTypes = ['png', 'jpeg', 'jpg', 'gif', 'bmp', 'tiff', 'tif'];
const defaultResolveHeaders = _.constant(defaultHeaders);
const defaultOptions = {
@@ -50,8 +51,8 @@ function generateCacheKey(url, options) {
const filePath = pathParts.join('/');
const parts = fileName.split('.');
- // TODO - try to figure out the file type or let the user provide it, for now use jpg as default
- const type = parts.length > 1 ? parts.pop() : 'jpg';
+ const fileType = parts.length > 1 ? _.toLower(parts.pop()) : '';
+ const type = defaultImageTypes.includes(fileType) ? fileType : 'jpg';
const cacheable = filePath + fileName + type + getQueryForCacheKey(parsedUrl, options.useQueryParamsInCacheKey);
return SHA1(cacheable) + '.' + type;
|
Filter image types
Make clear that the file type is an compatible image type.
|
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $startTime;
protected $loadClassCache;
- const VERSION = '2.8.3';
- const VERSION_ID = 20803;
+ const VERSION = '2.8.4-DEV';
+ const VERSION_ID = 20804;
const MAJOR_VERSION = 2;
const MINOR_VERSION = 8;
- const RELEASE_VERSION = 3;
- const EXTRA_VERSION = '';
+ const RELEASE_VERSION = 4;
+ const EXTRA_VERSION = 'DEV';
const END_OF_MAINTENANCE = '11/2018';
const END_OF_LIFE = '11/2019';
|
bumped Symfony version to <I>
|
diff --git a/src/resources/views/logger/partials/activity-table.blade.php b/src/resources/views/logger/partials/activity-table.blade.php
index <HASH>..<HASH> 100644
--- a/src/resources/views/logger/partials/activity-table.blade.php
+++ b/src/resources/views/logger/partials/activity-table.blade.php
@@ -68,7 +68,13 @@ if (Request::is('activity/cleared')) {
<tr @if($drilldownStatus && $hoverable) class="clickable-row" data-href="{{$prependUrl . $activity->id}}" data-toggle="tooltip" title="{{trans('LaravelLogger::laravel-logger.tooltips.viewRecord')}}" @endif >
<td>
<small>
- {{ $activity->id }}
+ @if($hoverable)
+ {{ $activity->id }}
+ @else
+ <a href="{{$prependUrl . $activity->id}}">
+ {{ $activity->id }}
+ </a>
+ @endif
</small>
</td>
<td>
|
Allow user to navigate inside the View Record Details page
|
diff --git a/tests/unit/modules/test_zcbuildout.py b/tests/unit/modules/test_zcbuildout.py
index <HASH>..<HASH> 100644
--- a/tests/unit/modules/test_zcbuildout.py
+++ b/tests/unit/modules/test_zcbuildout.py
@@ -78,7 +78,7 @@ class Base(TestCase, LoaderModuleMockMixin):
[salt.utils.path.which_bin(KNOWN_VIRTUALENV_BINARY_NAMES), cls.ppy_st]
)
subprocess.check_call(
- [os.path.join(cls.bin_st, "pip"), "install", "-U", "setuptools"]
+ [os.path.join(cls.bin_st, "pip"), "install", "-U", "setuptools<50.0.0"]
)
# distribute has been merged back in to setuptools as of v0.7. So, no
# need to upgrade distribute, but this seems to be the only way to get
|
Only upgrade to `setuptools<<I>` since the test requires `easy_install`
|
diff --git a/src/Event/Base/EventDispatcher.php b/src/Event/Base/EventDispatcher.php
index <HASH>..<HASH> 100644
--- a/src/Event/Base/EventDispatcher.php
+++ b/src/Event/Base/EventDispatcher.php
@@ -443,6 +443,8 @@ class EventDispatcher implements EventDispatcherInterface
case is_array($eventListener):
$data = get_class($eventListener[0]) . '::' . $eventListener[1];
break;
+ default:
+ break;
}
$this->_loggerInstance->makeLog([
|
missing default statement
Details of additions/deletions below:
--------------------------------------------------------------
Modified: Event/Base/EventDispatcher.php
-- Updated --
_logEvent added missing default statement
|
diff --git a/host/basil/utils/SimSiLibUsb.py b/host/basil/utils/SimSiLibUsb.py
index <HASH>..<HASH> 100644
--- a/host/basil/utils/SimSiLibUsb.py
+++ b/host/basil/utils/SimSiLibUsb.py
@@ -79,8 +79,9 @@ class SiUSBDevice(object):
raise NotImplementedError("To be implemented.")
def WriteI2C(self, address, data):
- raise NotImplementedError("To be implemented.")
+ print 'SiUSBDevice:WriteI2C', address, data #raise NotImplementedError("To be implemented.")
- def ReadI2C(address, size):
- raise NotImplementedError("To be implemented.")
+ def ReadI2C(self, address, size):
+ print 'SiUSBDevice:ReadI2C' #raise NotImplementedError("To be implemented.")
+ return array.array('B', range(size))
\ No newline at end of file
|
BUG: Fix I2C Sim
|
diff --git a/container/docker/engine.py b/container/docker/engine.py
index <HASH>..<HASH> 100644
--- a/container/docker/engine.py
+++ b/container/docker/engine.py
@@ -98,7 +98,7 @@ class Engine(BaseEngine):
COMPOSE_WHITELIST = (
'links', 'depends_on', 'cap_add', 'cap_drop', 'command', 'devices',
- 'dns', 'dns_opt', 'tmpfs', 'entrypoint', 'external_links', 'labels',
+ 'dns', 'dns_opt', 'tmpfs', 'entrypoint', 'environment', 'external_links', 'labels',
'links', 'logging', 'log_opt', 'networks', 'network_mode',
'pids_limit', 'ports', 'security_opt', 'stop_grace_period',
'stop_signal', 'sysctls', 'ulimits', 'userns_mode', 'volumes',
|
Adds 'environment' to COMPOSE_WHITELIST (#<I>)
|
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index <HASH>..<HASH> 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -859,8 +859,8 @@ func validateDriverVersion(vmDriver string) {
cmd := exec.Command("docker-machine-driver-kvm2", "version")
output, err := cmd.Output()
- // we don't want to fail if an error was returned, libmachine has a nice message for the user if
- // the driver isn't present
+ // we don't want to fail if an error was returned,
+ // libmachine has a nice message for the user if the driver isn't present
if err != nil {
console.Warning("Error checking driver version: %v", err)
return
@@ -868,6 +868,7 @@ func validateDriverVersion(vmDriver string) {
v := extractVMDriverVersion(string(output))
+ // if the driver doesn't have return any version, it is really old, we force a upgrade.
if len(v) == 0 {
exit.WithCode(exit.Failure, "Please upgrade the 'docker-machine-driver-kvm2'.")
}
|
Add comment about kvm2 force upgrade
|
diff --git a/revisionloader.py b/revisionloader.py
index <HASH>..<HASH> 100644
--- a/revisionloader.py
+++ b/revisionloader.py
@@ -92,7 +92,11 @@ class RevisionLoader(object):
#w = self.repo.weave_store.get_weave_or_empty(ie.file_id, tx)
#if ie.revision in w:
# continue
- # Try another way ...
+ # Try another way, realising that this assumes that the
+ # version is not already there. In the general case,
+ # a shared repository might already have the revision but
+ # we arguably don't need that check when importing from
+ # a foreign system.
if ie.revision != revision_id:
continue
text_parents = []
|
improve explanation of faster check in revisionloader
|
diff --git a/lib/Skeleton/Transaction/Transaction.php b/lib/Skeleton/Transaction/Transaction.php
index <HASH>..<HASH> 100644
--- a/lib/Skeleton/Transaction/Transaction.php
+++ b/lib/Skeleton/Transaction/Transaction.php
@@ -244,6 +244,7 @@ abstract class Transaction {
if (!$this->recurring) {
$this->completed = true;
}
+ $this->retry_attempt = 0;
$this->save();
}
|
Reset retry_attempt if completed
|
diff --git a/fermipy/jobs/target_plotting.py b/fermipy/jobs/target_plotting.py
index <HASH>..<HASH> 100644
--- a/fermipy/jobs/target_plotting.py
+++ b/fermipy/jobs/target_plotting.py
@@ -9,6 +9,7 @@ paralleize that analysis.
"""
from __future__ import absolute_import, division, print_function
+from os.path import splitext
from fermipy.utils import init_matplotlib_backend, load_yaml
@@ -42,14 +43,21 @@ class PlotCastro(Link):
def run_analysis(self, argv):
"""Run this analysis"""
args = self._parser.parse_args(argv)
- castro_data = CastroData.create_from_sedfile(args.infile)
+
+ exttype = splitext(args.infile)[-1]
+ if exttype in ['.fits', '.npy']:
+ castro_data = CastroData.create_from_sedfile(args.infile)
+ elif exttype in ['.yaml']:
+ castro_data = CastroData.create_from_yamlfile(args.infile)
+ else:
+ raise ValueError("Can not read file type %s for SED" % extype)
+
ylims = [1e-8, 1e-5]
plot = plotCastro(castro_data, ylims)
if args.outfile:
plot[0].savefig(args.outfile)
- return None
- return plot
+
class PlotCastro_SG(ScatterGather):
|
Allow reading in yaml file SED in fermipy-plot-sed
|
diff --git a/src/extensions/cookie/bootstrap-table-cookie.js b/src/extensions/cookie/bootstrap-table-cookie.js
index <HASH>..<HASH> 100644
--- a/src/extensions/cookie/bootstrap-table-cookie.js
+++ b/src/extensions/cookie/bootstrap-table-cookie.js
@@ -373,16 +373,13 @@ $.BootstrapTable = class extends $.BootstrapTable {
_toggleColumn (...args) {
super._toggleColumn(...args)
+ UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.getVisibleColumns()))
+ }
- const visibleColumns = []
-
- for (const column of this.columns) {
- if (column.visible) {
- visibleColumns.push(column.field)
- }
- }
+ _toggleAllColumns (...args) {
+ super._toggleAllColumns(...args)
- UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(visibleColumns))
+ UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.getVisibleColumns()))
}
selectPage (page) {
|
Adding cookie support for toggle all columns options
|
diff --git a/src/models/log.js b/src/models/log.js
index <HASH>..<HASH> 100644
--- a/src/models/log.js
+++ b/src/models/log.js
@@ -101,6 +101,7 @@ async function displayLogs ({ appAddonId, until, since, filter, deploymentId })
async function watchDeploymentAndDisplayLogs ({ ownerId, appId, deploymentId, commitId, knownDeployments, quiet, follow }) {
+ Logger.println('Waiting for deployment to start...');
const deployment = await waitForDeploymentStart({ ownerId, appId, deploymentId, commitId, knownDeployments });
Logger.println(colors.bold.blue(`Deployment started (${deployment.uuid})`));
|
deploy/restart: add "waiting for deployment to start..." message
|
diff --git a/app/assets/javascripts/jquery/active_scaffold.js b/app/assets/javascripts/jquery/active_scaffold.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/jquery/active_scaffold.js
+++ b/app/assets/javascripts/jquery/active_scaffold.js
@@ -148,7 +148,7 @@ $(document).ready(function() {
return true;
} else return false;
});
- $('input.update_form, textarea.update_form, select.update_form').live('change', function(event) {
+ $('input.update_form:not(.recordselect), textarea.update_form, select.update_form').live('change', function(event) {
var element = $(this);
var value = element.is("input:checkbox:not(:checked)") ? null : element.val();
ActiveScaffold.update_column(element, element.attr('data-update_url'), element.attr('data-update_send_form'), element.attr('id'), value);
|
fix recordselect with update_form, it wasn't working after typing to search
|
diff --git a/gulp/util/karma.conf.js b/gulp/util/karma.conf.js
index <HASH>..<HASH> 100644
--- a/gulp/util/karma.conf.js
+++ b/gulp/util/karma.conf.js
@@ -10,7 +10,7 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'node_modules/chai/chai.js',
- 'dist/pixi.dev.js',
+ 'bin/pixi.js',
'test/lib/**/*.js',
'test/unit/**/*.js',
// 'test/functional/**/*.js',
|
change karma path to pixi build
gulp build pixi to bin/pixi.js
|
diff --git a/cache.go b/cache.go
index <HASH>..<HASH> 100644
--- a/cache.go
+++ b/cache.go
@@ -26,7 +26,11 @@ func (item Item) expired(now time.Time) bool {
// Returns true if the item has expired.
func (item Item) Expired() bool {
- return item.expired(time.Now())
+ // "Inlining" of expired
+ if item.Expiration == emptyTime {
+ return false
+ }
+ return item.Expiration.Before(time.Now())
}
const (
@@ -108,9 +112,14 @@ func (c *cache) Replace(k string, x interface{}, d time.Duration) error {
// whether the key was found.
func (c *cache) Get(k string) (interface{}, bool) {
c.mu.RLock()
- x, found := c.get(k)
+ // "Inlining" of get
+ item, found := c.items[k]
+ if !found || item.Expired() {
+ c.mu.RUnlock()
+ return nil, false
+ }
c.mu.RUnlock()
- return x, found
+ return item.Object, found
}
func (c *cache) get(k string) (interface{}, bool) {
|
'Inline' Get and Expired
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
from setuptools import setup
setup(name='virtualbmc',
- version='0.0.2',
+ version='0.0.3',
description=('Create virtual BMCs for controlling virtual instances '
'via IPMI'),
url='http://github.com/umago/virtualbmc',
|
Bump the version of the project to <I>
|
diff --git a/lib/assets/CacheManifest.js b/lib/assets/CacheManifest.js
index <HASH>..<HASH> 100644
--- a/lib/assets/CacheManifest.js
+++ b/lib/assets/CacheManifest.js
@@ -2,6 +2,7 @@ var util = require('util'),
_ = require('underscore'),
errors = require('../errors'),
extendWithGettersAndSetters = require('../util/extendWithGettersAndSetters'),
+ AssetGraph = require('../AssetGraph'),
Text = require('./Text');
function CacheManifest(config) {
|
CacheManifest: Fixed parsing of existing cache manifest.
This was actually covered by a test, but the accidentally global var 'AssetGraph' that was fixed in <I>c<I> prevented the test from failing. What are the odds?
|
diff --git a/intranet/utils/html.py b/intranet/utils/html.py
index <HASH>..<HASH> 100644
--- a/intranet/utils/html.py
+++ b/intranet/utils/html.py
@@ -69,4 +69,6 @@ def safe_fcps_emerg_html(text: str, base_url: str) -> str:
return attrs
- return bleach.linkify(bleach.clean(text, tags=ALLOWED_TAGS, attributes=ALLOWED_ATTRIBUTES, styles=ALLOWED_STYLES), [translate_link_attr])
+ return bleach.linkify(
+ bleach.clean(text, strip=True, tags=ALLOWED_TAGS, attributes=ALLOWED_ATTRIBUTES, styles=ALLOWED_STYLES), [translate_link_attr]
+ )
|
fix(emerg): strip bad tags in FCPS emergency announcements
|
diff --git a/Template/Controller.php b/Template/Controller.php
index <HASH>..<HASH> 100644
--- a/Template/Controller.php
+++ b/Template/Controller.php
@@ -21,7 +21,7 @@ abstract class Controller
if( file_exists( $this->get_script_path() ) )
{
ob_start();
- include_once( $this->get_script_path() );
+ include( $this->get_script_path() );
$rendered_image = ob_get_clean();
}
else
|
Include once? I dont think so...
|
diff --git a/lib/poise_languages/command/mixin.rb b/lib/poise_languages/command/mixin.rb
index <HASH>..<HASH> 100644
--- a/lib/poise_languages/command/mixin.rb
+++ b/lib/poise_languages/command/mixin.rb
@@ -136,9 +136,10 @@ module PoiseLanguages
end
# Create the method to inherit settings from another resource.
- private define_method(:"#{name}_from_parent") { |resource|
+ define_method(:"#{name}_from_parent") do |resource|
language_command_runtime_from_parent(name, resource)
- }
+ end
+ private :"#{name}_from_parent"
end
# @api private
@@ -205,13 +206,15 @@ module PoiseLanguages
# @param name [Symbol] Language name.
# @return [void]
def language_command_mixin(name)
- private define_method(:"#{name}_shell_out") { |*command_args|
+ define_method(:"#{name}_shell_out") do |*command_args|
language_command_shell_out(name, *command_args)
- }
+ end
+ private :"#{name}_shell_out"
- private define_method(:"#{name}_shell_out!") { |*command_args|
+ define_method(:"#{name}_shell_out!") do |*command_args|
language_command_shell_out!(name, *command_args)
- }
+ end
+ private :"#{name}_shell_out!"
end
# @api private
|
My cute trick doesn't work on Ruby <I> :-(
Reported in <URL>
|
diff --git a/para-server/src/main/java/com/erudika/para/search/LuceneUtils.java b/para-server/src/main/java/com/erudika/para/search/LuceneUtils.java
index <HASH>..<HASH> 100644
--- a/para-server/src/main/java/com/erudika/para/search/LuceneUtils.java
+++ b/para-server/src/main/java/com/erudika/para/search/LuceneUtils.java
@@ -228,7 +228,14 @@ public final class LuceneUtils {
NOT_ANALYZED_FIELDS.add("token");
// these fields are not indexed
- IGNORED_FIELDS = new String[]{"validationConstraints", "resourcePermissions"};
+ IGNORED_FIELDS = new String[] {
+ "settings", // App
+ "datatypes", // App
+ "deviceState", // Thing
+ "deviceMetadata", // Thing
+ "resourcePermissions", // App
+ "validationConstraints" // App
+ };
}
private LuceneUtils() { }
|
added more fields to be ignored when indexing
|
diff --git a/sos/presets/redhat/__init__.py b/sos/presets/redhat/__init__.py
index <HASH>..<HASH> 100644
--- a/sos/presets/redhat/__init__.py
+++ b/sos/presets/redhat/__init__.py
@@ -36,10 +36,15 @@ RHOSP_OPTS = SoSOptions(plugopts=[
RHOCP = "ocp"
RHOCP_DESC = "OpenShift Container Platform by Red Hat"
-RHOCP_OPTS = SoSOptions(all_logs=True, verify=True, plugopts=[
- 'networking.timeout=600',
- 'networking.ethtool_namespaces=False',
- 'networking.namespaces=200'])
+RHOCP_OPTS = SoSOptions(
+ verify=True, skip_plugins=['cgroups'], container_runtime='crio',
+ no_report=True, log_size=100,
+ plugopts=[
+ 'crio.timeout=600',
+ 'networking.timeout=600',
+ 'networking.ethtool_namespaces=False',
+ 'networking.namespaces=200'
+ ])
RH_CFME = "cfme"
RH_CFME_DESC = "Red Hat CloudForms"
|
[presets] Adjust OCP preset options
Adjust the options used by the 'ocp' preset to better reflect the
current collection needs and approach.
This includes disabling the `cgroups` plugin due to the large amount of
mostly irrelevant data captured due to the high number of containers
present on OCP nodes, ensuring the `--container-runtime` option is set
to `crio` to align container-based collections, disabling HTML report
generation and increasing the base log size rather than blindly enabling
all-logs.
|
diff --git a/lib/fastlane/actions/actions_helper.rb b/lib/fastlane/actions/actions_helper.rb
index <HASH>..<HASH> 100644
--- a/lib/fastlane/actions/actions_helper.rb
+++ b/lib/fastlane/actions/actions_helper.rb
@@ -1,3 +1,5 @@
+require 'pty'
+
module Fastlane
module Actions
# Execute a shell command
@@ -7,10 +9,17 @@ module Fastlane
results = []
commands.each do |command|
- Helper.log.info ["[SHELL]", command.yellow].join(': ')
+ Helper.log.info ["[SHELL COMMAND]", command.yellow].join(': ')
unless Helper.is_test?
- results << `#{command}`
+
+ PTY.spawn(command) do |stdin, stdout, pid|
+ stdin.each do |line|
+ Helper.log.info ["[SHELL OUTPUT]", line.strip].join(': ')
+ results << line
+ end
+ end
+
else
results << command # only when running tests
end
|
Added live output of shell command results
|
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index <HASH>..<HASH> 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2308,5 +2308,19 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2017080700.01);
}
+ if ($oldversion < 2017082200.00) {
+ $plugins = ['radius', 'fc', 'nntp', 'pam', 'pop3', 'imap'];
+
+ foreach ($plugins as $plugin) {
+ // Check to see if the plugin exists on disk.
+ // If it does not, remove the config for it.
+ if (!file_exists($CFG->dirroot . "/auth/{$plugin}/auth.php")) {
+ // Clean config.
+ unset_all_config_for_plugin("auth_{$plugin}");
+ }
+ }
+ upgrade_main_savepoint(true, 2017082200.00);
+ }
+
return true;
}
diff --git a/version.php b/version.php
index <HASH>..<HASH> 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2017081700.00; // YYYYMMDD = weekly release date of this DEV branch.
+$version = 2017082200.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
|
MDL-<I> auth: Remove config for old plugins
Note: (<EMAIL>) Amended slightly from original to update versions.
|
diff --git a/lib/dml/simpletest/testdml.php b/lib/dml/simpletest/testdml.php
index <HASH>..<HASH> 100644
--- a/lib/dml/simpletest/testdml.php
+++ b/lib/dml/simpletest/testdml.php
@@ -1267,6 +1267,7 @@ class dml_test extends UnitTestCase {
}
// test get_records passing non-existing table
+ // with params
try {
$records = $DB->get_records('xxxx', array('id' => 0));
$this->fail('An Exception is missing, expected due to query against non-existing table');
@@ -1274,6 +1275,14 @@ class dml_test extends UnitTestCase {
$this->assertTrue($e instanceof dml_exception);
$this->assertEqual($e->errorcode, 'ddltablenotexist');
}
+ // and without params
+ try {
+ $records = $DB->get_records('xxxx', array());
+ $this->fail('An Exception is missing, expected due to query against non-existing table');
+ } catch (exception $e) {
+ $this->assertTrue($e instanceof dml_exception);
+ $this->assertEqual($e->errorcode, 'ddltablenotexist');
+ }
// test get_records passing non-existing column
try {
|
MDL-<I> dml - one more test behavior without params
|
diff --git a/bundles/org.eclipse.orion.client.javascript/web/eslint/lib/eslint.js b/bundles/org.eclipse.orion.client.javascript/web/eslint/lib/eslint.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.javascript/web/eslint/lib/eslint.js
+++ b/bundles/org.eclipse.orion.client.javascript/web/eslint/lib/eslint.js
@@ -200,7 +200,7 @@ module.exports = (function() {
var api = Object.create(new EventEmitter()),
messages = [],
- commentsAttached = false,
+ commentsAttached = true,
currentText = null,
currentConfig = null,
currentTokens = null,
@@ -224,7 +224,7 @@ module.exports = (function() {
* problem that ESLint identified just like any other.
*/
try {
- return esprima.parse(text, { loc: true, range: true, raw: true, tokens: true, comment: true });
+ return esprima.parse(text, { loc: true, range: true, raw: true, tokens: true, comment: true, attachComment:true });
} catch (ex) {
messages.push({
@@ -251,7 +251,7 @@ module.exports = (function() {
api.reset = function() {
this.removeAllListeners();
messages = [];
- commentsAttached = false;
+ commentsAttached = true;
currentConfig = null;
currentText = null;
currentTokens = null;
|
Bug <I> - ESLint re-attaches comments to AST
|
diff --git a/src/Controller/LogController.php b/src/Controller/LogController.php
index <HASH>..<HASH> 100644
--- a/src/Controller/LogController.php
+++ b/src/Controller/LogController.php
@@ -552,6 +552,14 @@ class LogController extends AbstractActionController
'log_date_added' => strftime($melisTranslation->getDateFormatByLocate($locale), strtotime($log->log_date_added))
);
+ if (strpos($melisTool->escapeHtml($translator->translate($log->log_message)), '[itemId]')) {
+ $rowData['log_message'] = str_replace(
+ '[itemId]',
+ $melisTool->escapeHtml($log->log_item_id),
+ $melisTool->escapeHtml($translator->translate($log->log_message))
+ );
+ }
+
array_push($tableData, $rowData);
}
|
can now add the item ID in the log message that has been translated
|
diff --git a/dynamic_raw_id/static/dynamic_raw_id/js/dynamic_raw_id.js b/dynamic_raw_id/static/dynamic_raw_id/js/dynamic_raw_id.js
index <HASH>..<HASH> 100644
--- a/dynamic_raw_id/static/dynamic_raw_id/js/dynamic_raw_id.js
+++ b/dynamic_raw_id/static/dynamic_raw_id/js/dynamic_raw_id.js
@@ -21,7 +21,8 @@ function dismissRelatedLookupPopup(win, chosenId) {
app = element.next("a").attr("data-app"),
model = element.next("a").attr("data-model"),
value = element.val(),
- MOUNT_URL = window.DYNAMIC_RAW_ID_MOUNT_URL || "/admin/dynamic_raw_id",
+ ADMIN_URL = window.DYNAMIC_RAW_ID_MOUNT_URL || "/admin/",
+ MOUNT_URL = ADMIN_URL + "dynamic_raw_id",
admin_url_parts = window.location.pathname.split("/").slice(1, 4);
var url = MOUNT_URL;
|
Update dynamic_raw_id.js to support custom admin url (#<I>)
* Update dynamic_raw_id.js
Update MOUNT_URL to work with custom admin urls
* Update dynamic_raw_id.js
* Update dynamic_raw_id.js
|
diff --git a/luigi/contrib/external_program.py b/luigi/contrib/external_program.py
index <HASH>..<HASH> 100644
--- a/luigi/contrib/external_program.py
+++ b/luigi/contrib/external_program.py
@@ -1,3 +1,18 @@
+"""
+Template tasks for running external programs as luigi tasks.
+
+This module is primarily intended for when you need to call a single external
+program, and it's enough to specify program arguments and environment
+variables.
+
+If you need to run multiple commands, chain them together or pipe output
+from one command to the next, you're probably better off using something like
+`plumbum`_, and wrapping plumbum commands in normal luigi
+:py:class:`~luigi.task.Task` s.
+
+.. _plumbum: https://plumbum.readthedocs.org/
+"""
+
import logging
import os
import signal
|
external_program: Add module-level docs
Mention that plumbum may be a better alternative, if you need more
advanced shell-like features when executing external programs.
|
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index <HASH>..<HASH> 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -87,18 +87,6 @@ module AbstractControllerTests
end
end
- class WithSymbolReturningString < Base
- layout :no_hello
-
- def index
- render :template => ActionView::Template::Text.new("Hello missing symbol!")
- end
- private
- def no_hello
- nil
- end
- end
-
class WithSymbolReturningNil < Base
layout :nilz
|
class WithSymbolReturningString is not used anywhere in the test.
Secondly it seemed from the method that the intent was to test a case
where layout was declared in a symbol and the method named mention in
layout returns nil.
That case is already covered with class class WithSymbolReturningNil .
Also the case of SymbolReturningString is covered with the class
WithSymbol.
|
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -27,7 +27,6 @@ gulp.task('script', function() {
builtins: null,
insertGlobals: false,
detectGlobals: false,
- standalone: 'Should',
fullPaths: false
})
.bundle();
|
Expose previous window.Should property manually
|
diff --git a/src/ol/format/wktformat.js b/src/ol/format/wktformat.js
index <HASH>..<HASH> 100644
--- a/src/ol/format/wktformat.js
+++ b/src/ol/format/wktformat.js
@@ -495,15 +495,15 @@ ol.format.WKT.Lexer.prototype.readNumber_ = function() {
do {
if (c == '.') {
decimal = true;
- } else if (goog.isDef(c) && c.toLowerCase() == 'e') {
+ } else if (c == 'e' || c == 'E') {
scientificNotation = true;
}
c = this.nextChar_();
} while (
this.isNumeric_(c, decimal) ||
- // once c is defined we may have a scientific number indicated by 'e'
- // but only if we haven't detected a scientific number before
- !scientificNotation && goog.isDef(c) && c.toLowerCase() == 'e' ||
+ // if we haven't detected a scientific number before, 'e' or 'E'
+ // hint that we should continue to read
+ !scientificNotation && (c == 'e' || c == 'E') ||
// once we know that we have a scientific number, both '-' and '+'
// are allowed
scientificNotation && (c == '-' || c == '+')
|
Simplify detection of scientific notation
This change allows us to remove some avoidable function calls (specifically
to goog.isDef(c) and c.toLowerCase()). Additionally, the new check is simpler
to read.
|
diff --git a/lib/View/Button.php b/lib/View/Button.php
index <HASH>..<HASH> 100644
--- a/lib/View/Button.php
+++ b/lib/View/Button.php
@@ -88,7 +88,7 @@ class View_Button extends View_HtmlElement {
// {{{ Obsolete
/** @obsolete */
function setAction($js=null,$page=null){
- throw $this->exception('setAction is not obsolete. use onClick or redirect method');
+ throw $this->exception('setAction() is now obsolete. use onClick() or redirect() method');
return $this;
}
|
View_Button: typo in comment
|
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -66,7 +66,7 @@ module ActionController
#
# You can also pass an object that responds to +maximum+, such as a
# collection of active records. In this case +last_modified+ will be set by
- # calling +maximum(:updated_at)+ on the collection (the timestamp of the
+ # calling <tt>maximum(:updated_at)</tt> on the collection (the timestamp of the
# most recently updated record) and the +etag+ by passing the object itself.
#
# def index
|
[ci skip] Fix <tt> in doc
|
diff --git a/openquake/calculators/classical.py b/openquake/calculators/classical.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/classical.py
+++ b/openquake/calculators/classical.py
@@ -132,6 +132,7 @@ class ClassicalCalculator(base.HazardCalculator):
ires = parallel.Starmap(
self.core_task.__func__, iterargs, self.monitor()
).submit_all()
+ self.csm.sources_by_trt.clear() # save memory
self.nsites = []
acc = ires.reduce(self.agg_dicts, self.zerodict())
if not self.nsites:
|
Saved memory in classical [skip hazardlib][demos]
|
diff --git a/lib/bel/version.rb b/lib/bel/version.rb
index <HASH>..<HASH> 100644
--- a/lib/bel/version.rb
+++ b/lib/bel/version.rb
@@ -1,3 +1,3 @@
module BEL
- VERSION = '0.4.0.beta.9'
+ VERSION = '0.4.0.beta.10'
end
|
bumped version to beta<I>
|
diff --git a/Lib/ufo2fdk/outlineOTF.py b/Lib/ufo2fdk/outlineOTF.py
index <HASH>..<HASH> 100644
--- a/Lib/ufo2fdk/outlineOTF.py
+++ b/Lib/ufo2fdk/outlineOTF.py
@@ -187,8 +187,8 @@ class OutlineOTFCompiler(object):
head.checkSumAdjustment = 0
head.tableVersion = 1.0
versionMajor = getAttrWithFallback(font.info, "versionMajor")
- versionMinor = getAttrWithFallback(font.info, "versionMinor") * .001
- head.fontRevision = versionMajor + versionMinor
+ versionMinor = getAttrWithFallback(font.info, "versionMinor")
+ head.fontRevision = float("%d.%d" % (versionMajor, versionMinor))
head.magicNumber = 0x5F0F3CF5
# upm
head.unitsPerEm = getAttrWithFallback(font.info, "unitsPerEm")
|
Don't make assumptions about version minor value.
In outlineOTF.py, there is code which assumes the minor version number
will be less than <I>, which probably is not a safe assumption.
|
diff --git a/napi/__init__.py b/napi/__init__.py
index <HASH>..<HASH> 100644
--- a/napi/__init__.py
+++ b/napi/__init__.py
@@ -44,12 +44,17 @@ class String(str):
nsource = String(open(os.path.join(imp.find_module('napi')[1],
'functions.py')).read())
+
+def register_magic():
+
+ from .magics import NapiMagics
+ ip = get_ipython()
+ if ip is not None:
+ ip.register_magics(NapiMagics(ip))
+
try:
from IPython import get_ipython
except ImportError:
pass
else:
- from .magics import NapiMagics
- ip = get_ipython()
- if ip is not None:
- ip.register_magics(NapiMagics(ip))
\ No newline at end of file
+ register_magic()
\ No newline at end of file
|
Added register_magic function.
|
diff --git a/tests/unit/modules/drac_test.py b/tests/unit/modules/drac_test.py
index <HASH>..<HASH> 100644
--- a/tests/unit/modules/drac_test.py
+++ b/tests/unit/modules/drac_test.py
@@ -98,7 +98,7 @@ class DracTestCase(TestCase):
mock = MagicMock(return_value={'retcode': 0,
'stdout': 'cfgUserAdminUserName=value'})
with patch.dict(drac.__salt__, {'cmd.run_all': mock}):
- self.assertEqual(drac.list_users(), {'value': {'index': 11}})
+ self.assertEqual(drac.list_users(), {'value': {'index': 17}})
def test_delete_user(self):
'''
|
Updated Unit test from <I> to <I>, to support <I> Dell DRAC user entries.
|
diff --git a/lib/webspicy/tester.rb b/lib/webspicy/tester.rb
index <HASH>..<HASH> 100644
--- a/lib/webspicy/tester.rb
+++ b/lib/webspicy/tester.rb
@@ -15,12 +15,12 @@ module Webspicy
scope.each_example(service) do |test_case|
describe test_case.description do
- before(:each) do
+ before(:all) do
client.before(test_case, service, resource)
end
subject do
- client.call(test_case, service, resource)
+ @invocation ||= client.call(test_case, service, resource)
end
it 'can be invoked successfuly' do
@@ -50,12 +50,12 @@ module Webspicy
scope.each_counterexamples(service) do |test_case|
describe test_case.description do
- before(:each) do
+ before(:all) do
client.before(test_case, service, resource)
end
subject do
- client.call(test_case, service, resource)
+ @invocation ||= client.call(test_case, service, resource)
end
it 'can be invoked successfuly' do
|
Do not re-invoke the web service at each step.
These are fake test steps, just aimed at having good description of
the various assertions. Invoking the web service each time is much
much too slow.
|
diff --git a/lib/locomotive/steam/middlewares/renderer.rb b/lib/locomotive/steam/middlewares/renderer.rb
index <HASH>..<HASH> 100644
--- a/lib/locomotive/steam/middlewares/renderer.rb
+++ b/lib/locomotive/steam/middlewares/renderer.rb
@@ -113,6 +113,7 @@ module Locomotive::Steam
'referer' => request.referer,
'url' => request.url,
'user_agent' => request.user_agent,
+ 'host' => request.host_with_port
}
end
|
host variable was missing from <I>.x
|
diff --git a/TYPO3.Flow/Tests/Unit/Utility/Unicode/TextIteratorTest.php b/TYPO3.Flow/Tests/Unit/Utility/Unicode/TextIteratorTest.php
index <HASH>..<HASH> 100644
--- a/TYPO3.Flow/Tests/Unit/Utility/Unicode/TextIteratorTest.php
+++ b/TYPO3.Flow/Tests/Unit/Utility/Unicode/TextIteratorTest.php
@@ -22,8 +22,6 @@ namespace F3\FLOW3\Utility\Unicode;
* The TYPO3 project - inspiring people to share! *
* */
-require_once 'PHPUnit/Framework.php';
-
/**
* Testcase for the TextIterator port
*
|
[~TASK] FLOW3: Remove PHPUnit/Framework inclusion
Relates to: #<I>
Change-Id: I<I>c<I>e<I>b<I>a<I>db3e<I>f<I>e6efac<I>c3fbe<I>
Original-Commit-Hash: a6b<I>bea<I>ec<I>a8edeb3f5a3bb6b<I>
|
diff --git a/test/ModalSpec.js b/test/ModalSpec.js
index <HASH>..<HASH> 100644
--- a/test/ModalSpec.js
+++ b/test/ModalSpec.js
@@ -84,6 +84,15 @@ describe('<Modal />', () => {
it('open on prop change', () => {
testModal.setProps({ open: true });
expect(modalStub).to.have.callCount(5);
+ expect(modalStub.firstCall.args[0]).to.deep.equal({ 'one': 1 });
+ expect(modalStub.lastCall.args).to.deep.equal([ 'open' ]);
+ });
+
+ it('closes on prop change', () => {
+ testModal.setProps({ open: false });
+ expect(modalStub).to.have.callCount(5);
+ expect(modalStub.firstCall.args[0]).to.deep.equal({ 'one': 1 });
+ expect(modalStub.lastCall.args).to.deep.equal([ 'close' ]);
});
});
|
added test to verify closing via props
|
diff --git a/tests/test_gvg.py b/tests/test_gvg.py
index <HASH>..<HASH> 100644
--- a/tests/test_gvg.py
+++ b/tests/test_gvg.py
@@ -475,6 +475,18 @@ def test_implosion():
assert game.player2.field.contains("GVG_045t")
+def test_implosion_commanding_shout():
+ game = prepare_game()
+ wisp = game.player1.give(WISP)
+ wisp.play()
+ shout = game.player1.give("NEW1_036")
+ shout.play()
+ implosion = game.player1.give("GVG_045")
+ implosion.play(target=wisp)
+ assert not wisp.dead
+ assert len(game.player1.field) in (3, 4, 5)
+
+
def test_iron_juggernaut():
game = prepare_empty_game()
game.player2.discard_hand()
|
Add a test for Imp-losion + Commanding Shout
Closes #<I>
|
diff --git a/packages/perspective-viewer-d3fc/src/js/chartConfig.js b/packages/perspective-viewer-d3fc/src/js/chartConfig.js
index <HASH>..<HASH> 100644
--- a/packages/perspective-viewer-d3fc/src/js/chartConfig.js
+++ b/packages/perspective-viewer-d3fc/src/js/chartConfig.js
@@ -120,7 +120,6 @@ export function configureMultiSvg(isSplitBy, gridlines, barSeries, dataset, colo
);
}
- const containerRect = container.getBoundingClientRect();
const tooltipDiv = d3
.select(container)
.append("div")
@@ -139,6 +138,7 @@ export function configureMultiSvg(isSplitBy, gridlines, barSeries, dataset, colo
d3.select(this)
.on("mouseover", () => {
// Bounding rect x and y not supported by edge or IE
+ const containerRect = container.getBoundingClientRect();
const barRect = this.getBoundingClientRect();
const left = barRect.x + barRect.width / 2 - containerRect.x;
const top = barRect.y - containerRect.y;
|
Moved containerRect instantiation to fix div position on toggle config
|
diff --git a/shared/src/main/java/com/couchbase/lite/Replicator.java b/shared/src/main/java/com/couchbase/lite/Replicator.java
index <HASH>..<HASH> 100644
--- a/shared/src/main/java/com/couchbase/lite/Replicator.java
+++ b/shared/src/main/java/com/couchbase/lite/Replicator.java
@@ -353,7 +353,12 @@ public final class Replicator extends NetworkReachabilityListener {
}
}
+ /**
+ * Reset checkpoint
+ */
public void resetCheckpoint() {
+ if (this.c4ReplStatus.getActivityLevel() != kC4Stopped)
+ throw new IllegalStateException("Replicator is not stopped. Resetting checkpoint is only allowed when the replicator is in the stopped state.");
config.setResetCheckpoint(true);
}
|
Fixed #<I> - <I>: throw InvalidOperationException in case of failing to call resetCheckpoint() - (#<I>)
|
diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js
index <HASH>..<HASH> 100644
--- a/src/ol/renderer/dom/domtilelayerrenderer.js
+++ b/src/ol/renderer/dom/domtilelayerrenderer.js
@@ -115,7 +115,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
tilesToDrawByZ, getTileIfLoaded);
var allTilesLoaded = true;
- var tile, tileState, x, y;
+ var childTileRange, fullyLoaded, tile, tileState, x, y;
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
for (y = tileRange.minY; y <= tileRange.maxY; ++y) {
@@ -130,7 +130,14 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
}
allTilesLoaded = false;
- tileGrid.forEachTileCoordParentTileRange(tile.tileCoord, findLoadedTiles);
+ fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
+ tile.tileCoord, findLoadedTiles);
+ if (!fullyLoaded) {
+ childTileRange = tileGrid.getTileCoordChildTileRange(tile.tileCoord);
+ if (!goog.isNull(childTileRange)) {
+ findLoadedTiles(z + 1, childTileRange);
+ }
+ }
}
|
Use high resolution tiles in DOM renderer
|
diff --git a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithAuthentication.php b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithAuthentication.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithAuthentication.php
+++ b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithAuthentication.php
@@ -82,6 +82,8 @@ trait InteractsWithAuthentication
{
$expected = $this->app->make('auth')->guard($guard)->user();
+ $this->assertNotNull($expected, 'The current user is not authenticated.');
+
$this->assertInstanceOf(
get_class($expected), $user,
'The currently authenticated user is not who was expected'
|
Ensure user is logged before expecting user instance type. (#<I>)
* Ensure user is logged.
Check the user is logged before expecting instance type.
* Update InteractsWithAuthentication.php
|
diff --git a/packages/react-router/modules/Switch.js b/packages/react-router/modules/Switch.js
index <HASH>..<HASH> 100644
--- a/packages/react-router/modules/Switch.js
+++ b/packages/react-router/modules/Switch.js
@@ -37,11 +37,12 @@ class Switch extends React.Component {
componentWillReceiveProps(nextProps) {
warning(
!(nextProps.location && !this.props.location),
- 'You cannot change from an uncontrolled to controlled Switch. You passed in a `location` prop on a re-render when initially there was none.'
+ '<Switch> elements should not change from controlled to uncontrolled (or vice versa). You initially used no "location" prop and then provided one on a subsequent render.'
)
+
warning(
!(!nextProps.location && this.props.location),
- 'You cannot change from a controlled to an uncontrolled Switch. You passed in a `location` prop initially but on a re-render there was none.'
+ '<Switch> elements should not change from controlled to uncontrolled (or vice versa). You provided a "location" prop initially but omitted it on a subsequent render.'
)
}
|
Use warning messages more similar to React
|
diff --git a/rdfunit-model/src/main/java/org/aksw/rdfunit/vocabulary/SHACL.java b/rdfunit-model/src/main/java/org/aksw/rdfunit/vocabulary/SHACL.java
index <HASH>..<HASH> 100644
--- a/rdfunit-model/src/main/java/org/aksw/rdfunit/vocabulary/SHACL.java
+++ b/rdfunit-model/src/main/java/org/aksw/rdfunit/vocabulary/SHACL.java
@@ -92,6 +92,9 @@ public final class SHACL {
public static final Property uniqueLang = property("uniqueLang");
public static final Property valueShape = property("valueShape");
+ public static final Property and = property("and");
+ public static final Property or = property("or");
+ public static final Property not = property("not");
|
add sh:and, sh:or and sh:not properties in SHACL vocab
|
diff --git a/src/test/java/uk/org/okapibarcode/backend/SymbolTest.java b/src/test/java/uk/org/okapibarcode/backend/SymbolTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/uk/org/okapibarcode/backend/SymbolTest.java
+++ b/src/test/java/uk/org/okapibarcode/backend/SymbolTest.java
@@ -313,7 +313,7 @@ public class SymbolTest {
} else {
return new UPCEReader();
}
- } else if (symbol instanceof DataBarExpanded && Character.isDigit(symbol.getContent().charAt(0))) {
+ } else if (symbol instanceof DataBarExpanded && symbol.getDataType() == DataType.GS1) {
return new RSSExpandedReader();
} else if (symbol instanceof DataBar14 && !((DataBar14) symbol).getLinkageFlag()) {
return new RSS14Reader();
|
DataBar Expanded: allow non-GS1 content, even though it's not recommended (and is not the default for this symbol type)
|
diff --git a/moco-core/src/main/java/com/github/dreamhead/moco/util/Jsons.java b/moco-core/src/main/java/com/github/dreamhead/moco/util/Jsons.java
index <HASH>..<HASH> 100644
--- a/moco-core/src/main/java/com/github/dreamhead/moco/util/Jsons.java
+++ b/moco-core/src/main/java/com/github/dreamhead/moco/util/Jsons.java
@@ -30,7 +30,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList;
import static java.lang.String.format;
public final class Jsons {
- private static final Logger logger = LoggerFactory.getLogger(Jsons.class);
+ private static Logger logger = LoggerFactory.getLogger(Jsons.class);
private static final TypeFactory DEFAULT_FACTORY = TypeFactory.defaultInstance();
private static final ObjectMapper DEFAULT_MAPPER = new ObjectMapper();
|
removed unused final from jsons
|
diff --git a/agents/builtin/mysql/mysql_test.go b/agents/builtin/mysql/mysql_test.go
index <HASH>..<HASH> 100644
--- a/agents/builtin/mysql/mysql_test.go
+++ b/agents/builtin/mysql/mysql_test.go
@@ -289,7 +289,7 @@ func TestMySQL(t *testing.T) {
require.Len(t, buckets, 1)
actual := buckets[0]
- assert.InDelta(t, 0.1, actual.MQueryTimeSum, 0.05)
+ assert.InDelta(t, 0.1, actual.MQueryTimeSum, 0.09)
expected := &qanpb.MetricsBucket{
Fingerprint: "SELECT `sleep` (?)",
DSchema: "world",
@@ -324,8 +324,8 @@ func TestMySQL(t *testing.T) {
require.Len(t, buckets, 1)
actual := buckets[0]
- assert.InDelta(t, 0, actual.MQueryTimeSum, 0.05)
- assert.InDelta(t, 0, actual.MLockTimeSum, 0.05)
+ assert.InDelta(t, 0, actual.MQueryTimeSum, 0.09)
+ assert.InDelta(t, 0, actual.MLockTimeSum, 0.09)
expected := &qanpb.MetricsBucket{
Fingerprint: "SELECT * FROM `city`",
DSchema: "world",
|
Fix tests on (slow) Travis CI.
|
diff --git a/cmd/juju/commands/synctools.go b/cmd/juju/commands/synctools.go
index <HASH>..<HASH> 100644
--- a/cmd/juju/commands/synctools.go
+++ b/cmd/juju/commands/synctools.go
@@ -50,8 +50,8 @@ var _ cmd.Command = (*syncToolsCommand)(nil)
const synctoolsDoc = `
This copies the Juju agent software from the official agent binaries store
-(located at https://streams.canonical.com/juju) into a model.
-It is generally done when the model is without Internet access.
+(located at https://streams.canonical.com/juju) into the controller.
+It is generally done when the controller is without Internet access.
Instead of the above site, a local directory can be specified as source.
The online store will, of course, need to be contacted at some point to get
@@ -63,14 +63,14 @@ Examples:
juju sync-agent-binaries --debug --source=/home/ubuntu/sync-agent-binaries
See also:
- upgrade-model
+ upgrade-controller
`
func (c *syncToolsCommand) Info() *cmd.Info {
return jujucmd.Info(&cmd.Info{
Name: "sync-agent-binaries",
- Purpose: "Copy agent binaries from the official agent store into a local model.",
+ Purpose: "Copy agent binaries from the official agent store into a local controller.",
Doc: synctoolsDoc,
Aliases: []string{"sync-tools"},
})
|
fix lp:<I>, replace mention of model with controller
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.