Dan Mills
9f77422143
merge upstream changes
2008-06-26 16:38:00 -07:00
Dan Mills
6f246308bc
don't even try to sync when the local lock is taken
2008-06-26 16:37:38 -07:00
Atul Varma
b31c786d84
Automated merge with http://hg.mozilla.org/labs/weave
2008-06-26 16:28:55 -07:00
Atul Varma
e0f26c39a3
Added a bookmark sync test that exercises the commandLike() method by adding two identical bookmarks with different GUIDs to different profiles and then syncing.
2008-06-26 16:28:44 -07:00
Atul Varma
aa4a046d61
Added an additional check in stores.js to prevent a strict warning from appearing.
2008-06-26 16:27:54 -07:00
Dan Mills
8bc8c1abbb
when we abort a lock request because we already hold a token, reset _lockAllowed to allow further requests for locks
2008-06-26 16:26:14 -07:00
Dan Mills
c3a7956e61
fix unit test makefile so it works on windows (no symlinks on windows, boo)
2008-06-26 16:09:22 -07:00
Dan Mills
6d7c4f1bbd
merge upstream changes
2008-06-26 15:37:55 -07:00
Dan Mills
47dd0daafe
disabling password sync by default due to bug 438356
2008-06-26 15:37:30 -07:00
Chris Beard
e4bd9df954
adding EULA that will be displayed and must be agreed to on first run
2008-06-26 18:37:05 -04:00
Justin Dolske
1b2e7b297b
Use statically-sized stack buffers to fix building on Windows.
2008-06-26 15:22:48 -07:00
Atul Varma
e9e88705ce
Automated merge with http://hg.mozilla.org/labs/weave
2008-06-26 15:02:08 -07:00
Atul Varma
2bd0a8ac17
Refactored some things in the test framework to make tests easier to write, and to make certain things possible to write.
2008-06-26 15:01:34 -07:00
Anant Narayanan
62a0ebb31e
Add license headers to all files which didn't have them.
2008-06-26 14:49:01 -07:00
Dan Mills
277753d21a
tone down tab engine debugging output a bit
2008-06-26 14:34:32 -07:00
Dan Mills
703829a510
fix comment in verifyLogin
2008-06-26 14:30:38 -07:00
Dan Mills
5c7f8c6a40
check login status code in service's verifyLogin; attempt to create user directory when it's a 404
2008-06-26 12:27:54 -07:00
Dan Mills
6badbcac4d
merge upstream changes
2008-06-26 12:23:07 -07:00
Dan Mills
2d3216c74e
return http status code from dav's checkLogin
2008-06-26 12:22:19 -07:00
Dan Mills
e021d9ade1
disable bookmarks sharing & xmpp for developer release
2008-06-26 12:21:25 -07:00
Maria Emerson
8d963abd80
added text (not final), changed background, some code clean-up, todo: more code clean-up, fix large buttons (they are ugly)
2008-06-26 12:09:28 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
437cac3a82
For developer release, made bookmark sharing and xmpp preferences default to false
2008-06-26 12:07:38 -07:00
Atul Varma
f33b85dc5d
Automated merge with http://hg.mozilla.org/labs/weave
2008-06-26 11:40:24 -07:00
Atul Varma
792f0f7e87
Refactored password sync test to use newly-added functionality in the sync testing infrastructure.
2008-06-26 11:40:14 -07:00
Atul Varma
0e87611a56
Revalidated log for password sync test, which changed due to Thunder's changes that put deltas for individual versions into their own files on WebDAV.
2008-06-26 11:38:40 -07:00
Anant Narayanan
dcb7a1ada2
Automated merge
2008-06-26 11:16:02 -07:00
Anant Narayanan
2339871cf6
Prevent multiple lock requests from being executed (bug 441922, r=thunder)
2008-06-26 11:15:02 -07:00
Atul Varma
6e8d38ac08
Refactored client state-changing functions out of test_bookmark_syncing.js and into head.js, as part of the SyncTestingInfrastructure class, so that other test suites can use them.
2008-06-26 11:07:13 -07:00
Justin Dolske
4abaf0f90c
bustage fix: call this.foo(), not foo().
2008-06-25 18:32:59 -07:00
Anant Narayanan
ee51a31ea5
Remove runCmd and other openssl related stuff we no longer need. (bug 441898, r=thunder)
2008-06-25 17:10:24 -07:00
Anant Narayanan
b53674f5dc
Handle removeCommand in FormEngine correctly. (bug 441874, r=thunder)
2008-06-25 17:09:18 -07:00
Atul Varma
4740979f77
Automated merge with http://hg.mozilla.org/labs/weave
2008-06-25 17:05:25 -07:00
Atul Varma
cd2f7cdb93
Bookmark sync test now attempts to add a bookmark on the second computer, then re-sync on the first computer and ensure that the bookmark is copied over.
2008-06-25 17:05:20 -07:00
Anant Narayanan
710665c8e2
Branch merge
2008-06-25 16:34:50 -07:00
Anant Narayanan
c8b970ae19
Change default server URL to services.mozilla.com
2008-06-25 16:34:28 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
a2dede213a
Merged
2008-06-25 15:55:13 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
3f37543011
Set up bookmarkEngine._incomingShareOffer to use Myk's new Notification stuff to offer a notification to the user, asking them to accept or reject the incoming share.
2008-06-25 15:54:33 -07:00
Maria Emerson
946084c271
fixed interaction details, all login/verify cases work correctly, final screen creates account and syncs correctly
2008-06-25 15:44:35 -07:00
Atul Varma
9beba70275
Added a number of "real" bookmark sync tests; see test_bookmark_syncing.js for information.
2008-06-25 14:30:53 -07:00
Myk Melez
cab1d95570
bug 436636: a system for showing various kinds of notifications in one consolidated location
2008-06-25 13:51:39 -07:00
Myk Melez
b379fdece8
the tabs engine needs a constant
2008-06-25 13:51:32 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
6f37a50f99
The share/stop sharing menu item is now added only to normal bookmark folders: Not to the main bookmark menu or to magic folders like 'recently tagged' or whatever.
2008-06-25 11:58:04 -07:00
Atul Varma
92f85d952e
Another automated merge. I'm kind of confused at this point, so I hope I'm not breaking anything by mis-merging.
2008-06-25 04:45:22 -07:00
Atul Varma
c747b0559e
Automatic merge.
2008-06-25 04:44:25 -07:00
Maria Emerson
e1e6f79037
fix login calls, do login and sync on final screen, add try again link to server errors throughout
2008-06-25 04:43:13 -07:00
Atul Varma
37225f431c
Changed AsyncException so that it dynamically subclasses the exception it's wrapping, and adds an 'asyncStack' property to allow access to the asynchronous call stack. This, along with my previous few commits, makes the processing of stack traces in our code much more streamlined, and also allows our debugging output to be more informative, as stack information is now logged from the point at which an exception was thrown, rather than the point at which it was caught.
...
Also renamed some things in async.js to be more descriptive and easier-to-understand, albeit a bit more verbose.
2008-06-25 04:43:07 -07:00
Myk Melez
be2bf638be
bug 441446: set mozBackgroundRequest on XMPP request object when created rather than when used, since it only needs to be set once
2008-06-25 01:56:17 -07:00
Justin Dolske
b015539e7a
Split account verification out from login(), make wizard work for using an existing account, related code cleanup/simplification
2008-06-25 00:22:53 -07:00
Atul Varma
9d7f1afc80
Made exception logging routines more informative and added logtests for them.
2008-06-25 00:13:36 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
1d19d1357f
Merged
2008-06-24 21:15:23 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
b24d0c7180
Moved all of the bookmark-share stuff out of the bookmarkEngine class into a new BookmarksSharingManager class.
2008-06-24 21:15:14 -07:00
Atul Varma
7b4737aed7
Fixed something that I should've changed in my last commit; also removed a call to Utils.stackTrace() that shouldn't have been made.
2008-06-24 19:58:50 -07:00
Justin Dolske
e25d17c184
Bustage fix: frame.filename can be null, and the async stack dump can then fail (which causes other problems)
2008-06-24 19:39:58 -07:00
Atul Varma
7327a55d0d
Renamed AsyncException.trace and Generator.trace to AsyncException.traceback and Generator.traceback, respectively, to distinguish them from Logger.trace() and also explicitly indicate their noun-like nature (since they're properties).
2008-06-24 19:15:54 -07:00
Atul Varma
caa3295271
Renamed the global trace() function in async.js to traceAsyncFrame(), to avoid confusing it with Logger.trace(), AsyncException.trace, and Generator.trace, all of which are also used in that file.
2008-06-24 19:08:35 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
bc4d891c3a
Moved the folder name and annotation for the incoming shares root folder to string constants.
2008-06-24 18:38:29 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
8cc67dd324
Merged
2008-06-24 18:28:26 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
fcd94e31e2
Fixed all the places where I was accidentally calling it incomingShareAnno instead of incomingSharedAnno (note the missing letter d). Same for outgoingSharedAnno.
2008-06-24 18:28:01 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
4cba1fd51c
Removed all uses of the 'weave/mounted-shares-id' annotation, since it's been made obsolete by INCOMING_SHARED_ANNO.
2008-06-24 18:23:43 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
0edbf9998f
Changes in the annotations relevant to incoming/outgoing share folders are now handled by editCommands in the syncCore.
2008-06-24 18:15:17 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
4bc77b8e05
Annotations on incoming and outgoing share folders are now wrapped for sync, and handled on incoming createCommands.
2008-06-24 18:09:41 -07:00
Myk Melez
8dcf0279c4
bug 441446: set mozBackgroundRequest on XMPP request object when created rather than when used, since it only needs to be set once
2008-06-24 17:45:37 -07:00
Atul Varma
b5dc3b878a
Added a really, really basic sync test for bookmarks.
2008-06-24 16:55:56 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
2158cdf9c4
Merged
2008-06-24 13:41:25 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
c4fa84f683
Merged
2008-06-24 13:41:12 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
03d94018af
Added todo about exception handling
2008-06-24 13:41:01 -07:00
chris@h-194.office.mozilla.org
95d87d63e0
merging
2008-06-24 12:44:26 -07:00
chris@h-194.office.mozilla.org
32d06ac143
added embedded verification method to login (this wants to be it's own object method, but should work well enough for now.)
...
some formatted cleanup for wizard.js
2008-06-24 12:42:52 -07:00
Dan Mills
e2fc25dbfa
Store each delta as a separate file on the server
2008-06-24 12:33:27 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
286e670fb2
Finished the bridge between UI code and bookmark engine so that stopSharing gets called when you pick the menu itme.
2008-06-24 12:22:32 -07:00
chris@chris-beards-macbook-pro-2.local
b969583294
another pass at polishing the first run experience, work in progress
2008-06-24 08:51:40 -07:00
Maria Emerson
c968d59fe3
consolidated error reporting, formatting tbd
2008-06-23 22:48:44 -07:00
Atul Varma
f9ab00520c
Separated test_passwords into itself, which contains pure unit tests, and test_password_syncing, which contains a suite that's more along the lines of a system test, though still with plenty of stuff faked-out. fake_login_manager.js contains code shared between the two suites.
...
--HG--
rename : services/sync/tests/unit/test_passwords.log.expected => services/sync/tests/unit/test_password_syncing.log.expected
2008-06-23 21:21:40 -07:00
Atul Varma
0258487f7a
Refactored stuff out of test_passwords and into head.js to make creating new sync tests for different engines easier.
2008-06-23 20:57:10 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
ed99f7cb53
Make the stop-sharing-data command work
2008-06-23 18:23:08 -07:00
Atul Varma
088eeebfd3
Added some more visibility to the individual steps of test_passwords.
2008-06-23 18:01:48 -07:00
Atul Varma
387927da84
Updated expected log for test_passwords based on recent code changes.
2008-06-23 17:41:01 -07:00
Justin Dolske
6ed3755104
Bug 433949 - Use WeaveCrypto component (NSS) instead of OpenSSL
2008-06-23 16:23:57 -07:00
Myk Melez
bb55bba909
Automated merge with ssh://hg.mozilla.org/labs/weave/
2008-06-23 16:22:17 -07:00
Myk Melez
9668227aad
wrap notify around lock instead of the other way around so that notify includes locking failure/success in its notifications
2008-06-23 16:22:05 -07:00
Justin Dolske
6162fe5ab1
Use allocated buffers instead of stack when the buffers can be large (OS X has a 1MB limit)
2008-06-23 16:14:55 -07:00
Myk Melez
6cdf7d9c0d
bug 435341: sync automatically when Firefox quits
2008-06-23 16:10:31 -07:00
Maria Emerson
21df91abd7
work in progress, push for wizard
2008-06-23 15:48:01 -07:00
Atul Varma
ed6f207586
Added 'resync on second computer' step to test_passwords.
2008-06-23 14:45:58 -07:00
Atul Varma
c573243c97
Removed a line of code that was raising a strict warning, and which also just defined an unused local variable that called no functions and therefore had no side effects (unless there were property getters that had side-effects involved, which hopefully wasn't the case).
2008-06-23 14:32:55 -07:00
Atul Varma
cd6f3ef8d3
Moved the FakeGUIDService from test_passwords.js to head.js.
2008-06-23 14:13:46 -07:00
Justin Dolske
1cba11e508
Add Makefile support for building on ARM, move comment that triggers bug on scratchbox's Make 3.80
2008-06-22 14:43:09 -07:00
Atul Varma
9baa177ade
A tiny bit more refactoring to test_passwords.
2008-06-20 18:36:33 -07:00
Atul Varma
77a64f448f
Oops, forgot to recommit the canonical log for test_passwords in my last commit.
2008-06-20 18:36:11 -07:00
Atul Varma
7e429a9eba
Fake GUID generator now provides a different yet deterministic GUID upon each invocation.
2008-06-20 18:25:21 -07:00
Atul Varma
fd24f3706a
test_passwords now also removes a user after doing everything else.
2008-06-20 18:04:59 -07:00
Atul Varma
01b47a4865
Factored out the fake filesystem related functions in test_passwords.js into a FakeFilesystemService class in head.js.
2008-06-20 17:47:32 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
4489fb2ce3
The XMPP server is now configured to use LDAP for authentication (on sm-labs01, and soon to be on services.mozilla too) so the xmpp username/password will now be the same as the weave username/password. So I now use those to login, and I got rid of the two extra preferences which we used to have for xmpp username/password.
2008-06-20 17:19:10 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
7d953f2669
fixed some minor formatting
2008-06-20 16:46:38 -07:00
Atul Varma
0d27ee6f89
Refactored test_passwords to make it more modular and readable, changed the formatting of some log messages to be more descriptive.
2008-06-20 15:39:07 -07:00
Myk Melez
e760fc6a12
make xmpp requests be background requests so they don't get horked by load group problems or throw up auth dialogs
2008-06-20 14:26:40 -07:00
Atul Varma
4c78f8d170
Improved test_passwords so that it syncs, re-syncs, adds a new user, and re-syncs again.
...
Fixed a strict warning in engines.js.
2008-06-20 14:22:06 -07:00
Atul Varma
4e39258260
Made the tracking of async generators/coroutines more robust for debugging purposes.
...
Refactored code in syncCores.js to use Utils.makeTimerForCall().
Improved test_passwords to perform an additional sync after the initial one.
2008-06-20 13:58:56 -07:00
Atul Varma
2f9945b9d3
Added more informative output for fake DAV, so that log-based tests are both more self-documenting re: Weave's behavior and serve as more robust test cases.
2008-06-20 12:49:25 -07:00
Atul Varma
a39acd2449
Added an expected-log for the passwords sync engine unit test.
2008-06-20 12:39:50 -07:00
Atul Varma
ac90aaff04
Refactoring: consolidated duplicate code creating GUIDs via XPCOM gunk into a new function, Utils.makeGUID().
...
Note that there are some strange things re: whitespace in engines/bookmarks.js in this changeset; I literally only changed one line, though, and I'm not sure where they came from. Maybe it was js2-mode?
2008-06-20 12:34:29 -07:00
Atul Varma
11abf27a3e
Minor code tidying.
2008-06-20 12:27:17 -07:00
Atul Varma
32c7be2a6f
Changed log level in a unit test.
2008-06-20 12:24:02 -07:00
Justin Dolske
58435fa195
Small bug fix from my last small bugfix. :(
2008-06-19 20:18:59 -07:00
Atul Varma
aa73eb4763
Fixed a bug in the outstanding-callback-warning system and made Generator.throw() and Generator.cont() private methods because no client code was using them and it could introduce bugs in the system if they do; we can revisit making them public again later if we want.
2008-06-19 19:03:10 -07:00
Maria Emerson
19ef5f5903
Automated merge with ssh://memerson@mozilla.com@hg.mozilla.org/labs/weave
2008-06-19 17:55:09 -07:00
Atul Varma
ea744597ab
Modified the way logging works in unit testing; fake testing components now log as part of the 'Testing' logger instead of the root logger.
2008-06-19 17:04:04 -07:00
Atul Varma
237b9c8f1d
Removed warning message from ID.get() because it's actually normal to pass in an ID that doesn't exist to it, to test for its existence. Though perhaps there should be an exists() method for such a use case instead.
2008-06-19 16:37:53 -07:00
Atul Varma
93520a6e78
Added more fake prefs to the password test to eliminate strict warnings, added logging code to identity.js to aid in debugging.
2008-06-19 16:03:42 -07:00
Maria Emerson
e601518a2e
updating wizard
2008-06-19 15:43:50 -07:00
Justin Dolske
50174a9bff
Fix reference to undefined function and bad async arg.
2008-06-19 15:36:24 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
4f11d0d14d
Fixed some more missing commas that were preventing engines/bookmarks.js from loading
2008-06-19 15:25:25 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
28bf4dc4f6
Added missing comma after function definition
2008-06-19 15:23:01 -07:00
Justin Dolske
8cb487fcc3
Apparently NS_IMPL_NSGETMODULE("FOO") doesn't work on Linux, but NS_IMPL_NSGETMODULE(FOO) does.
2008-06-19 14:51:20 -07:00
Justin Dolske
28ffd269e9
Minor tweaks for compile errors on Linux.
2008-06-19 13:03:10 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
d58bdfe874
Backed out changeset 7720a1dd564a because the new crypto stuff that it uses hasn't been enabled yet.
2008-06-19 11:59:52 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
bff803b730
Applied dolske's patch from bug 433949 to make the bookmarkEngine work with the new improved Crypto interface.
2008-06-19 11:41:57 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
467eaba47c
merged
2008-06-19 10:51:54 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
5725f10629
Reimplemented most of _updateIncomingShare to work with the new implementation of _updateOutgoingShare. No more need for the ugly hack to temporarily set the root directory of DAV, hooray
2008-06-18 23:27:48 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
423c88e98c
Implemented _stopOutgoingShare (though it's still not being called from anywhere).
2008-06-18 23:00:09 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
624280ac82
Added documentation to createIncomingShare, rewrote it a little to be consistent with the other new stuff, and made it use annotations to keep track of the server path to the shared data.
2008-06-18 22:37:06 -07:00
Justin Dolske
4078b28f1d
Checkin of NSS-ized WeaveCrypto module (not yet used)
2008-06-18 21:42:16 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
e4d31fe71d
Gave the bookmarksEngine a permanent (lazy-initialized) reference to the annotation service, rather than recreating the reference every single time we use the service. Which is a lot of times now.
2008-06-18 20:53:11 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
9cc02dd84a
Implemented _updateAllOutgoingShares in bookmarkEngine.
2008-06-18 20:45:01 -07:00
Myk Melez
6b9854fb49
Automated merge with ssh://hg.mozilla.org/labs/weave/
2008-06-18 19:35:31 -07:00
Myk Melez
bef3575bef
bug 439553: add a 'change password' form to the weave preferences
2008-06-18 19:35:23 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
f903901b8e
Removed an unneeded yield statement from startXmppClient (this was raising warnings about yeilding without a callback.)
2008-06-18 18:48:17 -07:00
Atul Varma
6046183cfa
Finished test_passwords.js, although it raises a number of strict warnings.
2008-06-18 18:08:33 -07:00
Atul Varma
837747b2b8
Replaced boilerplate XPCOM code with calls to util.js functions.
2008-06-18 18:04:01 -07:00
Atul Varma
920bb46e7c
Fixed a preference typo in test_service.js.
2008-06-18 17:33:44 -07:00
Atul Varma
4165ed8219
Automated merge with http://hg.mozilla.org/labs/weave
2008-06-18 17:28:38 -07:00
Atul Varma
251f02b0f0
test_passwords.js now performs a fake sync, but I ran into an issue that may be a bug in remote.js.
2008-06-18 17:28:28 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
8a4b887b1b
Set the default preference for weave's xmpp server-url to be the new secure url for the ejabberd server on sm-labs01.
2008-06-18 17:25:46 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
da54b30943
Turned all remaining dump()s in transportLayer.js into Log4Moz debug calls.
2008-06-18 17:23:04 -07:00
Atul Varma
7829070424
Refactoring; moved code out of test_service.js and into unit/head.js for use by other tests.
2008-06-18 16:51:54 -07:00
Atul Varma
e9670abd3f
Added a new property to async.js, Async.outstandingGenerators, which returns the number of generators that haven't yet been finalized. This can be used for diagnostic purposes to determine whether generators haven't yet been called back.
2008-06-18 16:11:15 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
110f387e1c
Imported Log4Moz to xmpp/transportLayer.js and xmpp/authenticationLayer.js, so they're no longer raising errors about Log4Moz being undefined (oops, sorry, should have tested before pushing.)
2008-06-18 14:59:06 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
5346076d1f
Merged
2008-06-18 14:53:30 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
51c929369d
XMPPClient sends its debugging output to log4moz (mostly debug level) now instead of dump, so it's less annoyingly verbose.
2008-06-18 14:50:02 -07:00
Atul Varma
30046913d8
Refactored some file operations into a new function in Utils and out of engines.js.
2008-06-18 14:12:24 -07:00
Justin Dolske
44f48bc439
You have: no tea. (Remove old TEA crypto support)
2008-06-18 13:25:58 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
8c09f36ad5
The xmpp messages that are sent when a share is offered now include the server-side path to the share directory.
2008-06-18 13:16:32 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
2a1462352b
Merged
2008-06-18 12:48:26 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
0bef123361
made all calls to Resource.get() and Resource.put() properly asynchronous.
2008-06-18 12:48:20 -07:00
Atul Varma
1ab8baed0c
Fixed typos.
2008-06-18 12:45:02 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
03cf0d6f73
Removed the check of whether the directory exists before creating it, in _createOutgoingShare(): realized it's not neccessary since DAV.MKCOL already does it.
2008-06-18 12:41:34 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
c7ac787fb1
Merged
2008-06-18 12:32:52 -07:00
Atul Varma
62236e45cd
Replaced a bunch of boilerplate XPCOM with a call to Utils.makeTimerForCall().
2008-06-18 12:32:20 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
68669b6a0f
Merged changes
2008-06-18 12:29:39 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
6503df042f
Added documentation to BookmarkEngine._updateOutgoingShare.
2008-06-18 12:29:25 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
eb2aa3c9bb
Complete rewrite of _createOutgoingShare and _updateOutgoingShare in BookmarkEngine, using remote.Resource objects and Crypto.
2008-06-18 12:26:51 -07:00
Atul Varma
ce9f6b0af8
Removed an unused constructor parameter from PasswordEngine.
2008-06-18 12:04:49 -07:00
Atul Varma
22a628bfea
Moved XPCOM-specific stuff from engines/passwords.js to util.js so they could be easily stubbed-out by unit tests.
2008-06-18 11:54:24 -07:00
Atul Varma
90d243db16
Refactored test_service and module code so that the weave service constructor is called, and auth is done more accurately.
2008-06-17 19:54:09 -07:00
Atul Varma
945a8b782a
The manage.py test-runner now compares expected results to actual results if a '<test-name>.log.expected' file exists in the test directory; if they don't match, a unified diff is displayed. Note that this is only done via manage.py, it's not currently implemented in the Makefile test framework because makefiles make me barf.
2008-06-17 12:04:40 -07:00
Atul Varma
a6cca49fc3
Added a fake preference service to test_service.
2008-06-17 11:45:13 -07:00
Atul Varma
6b20868829
Fixed a minor typo, though there's a better way to do the unary getter which Myk told me about; will probably substitute that soon.
2008-06-17 11:11:56 -07:00
Atul Varma
f9463209a2
Added a fixme/todo in the code.
2008-06-17 10:23:35 -07:00
Dan Mills
dec04b1bc3
merge upstream changes
2008-06-17 18:04:16 +09:00
Dan Mills
0c3a240876
make RemoteStore a but more Store-like (wrap, wipe methods); fix a missing yield
2008-06-17 18:03:02 +09:00
Dan Mills
5e07cb98d5
Don't allow re-entrance! Fail to lock when we already hold a lock.
2008-06-17 18:01:48 +09:00
Atul Varma
245e6492da
Fixed a strict warning in util.js.
2008-06-16 18:11:41 -07:00
Atul Varma
b0ca747fe2
Added test_service, which currently tests the case in which the server's meta/version and private/privkey files are correct, as well as all authentication information.
2008-06-16 18:08:37 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
43eec5b867
In the middle of trying to make createOutgoingShare work with Dan's changes (getSymKey having been moved to remote.js, etc.)
2008-06-16 17:52:24 -07:00
Dan Mills
99e6994409
merge upstream changes
2008-06-17 09:51:25 +09:00
Dan Mills
5c196a641a
treat paths beginning with '/' as absolute
2008-06-17 09:51:02 +09:00
Atul Varma
8d40fc280b
Refactored test suites based on recent changes.
2008-06-16 16:53:53 -07:00
Atul Varma
459e94fa97
Factored out fake-timer code into a separate class and moved it to head.js.
2008-06-16 16:42:32 -07:00
Atul Varma
de38af3819
Refactored head.js for unit tests so that we now have an 'initTestLogging()' function.
2008-06-16 16:22:00 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
f4e7177928
Merged
2008-06-16 15:52:26 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
f6cc70889f
Trying to debug _createOutgoingShare...
2008-06-16 15:52:15 -07:00
Atul Varma
2675855ed4
Defined Cu -> Components.utils in head.js so that test files don't have to put it in as boilerplate.
2008-06-16 14:06:05 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
6ce93ffd1d
Merged
2008-06-16 11:24:41 -07:00
Dan Mills
f8a841ee5e
move more remote-interaction code into RemoteStore (and out of Engine)
2008-06-17 01:04:23 +09:00
Dan Mills
f74b9f910f
catch 404s from initSession and do an initial upload; fix some bugs (missing yields, references to Engine properties) in RemoteStore.initialize
2008-06-16 00:21:44 +09:00
Dan Mills
a8ad7d2804
merge upstream changes
2008-06-15 13:42:10 +09:00
Dan Mills
561b27a92c
merge upstream changes
2008-06-14 17:10:40 +09:00
Dan Mills
049ecf1de3
Move remote init code ('fullUpload') into RemoteStore; make RemoteStore hold an Engine object (tightly coupling them); make the server prefix and identity properties of Engine public
2008-06-14 17:07:06 +09:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
9805cdce23
Merged
2008-06-13 16:22:04 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
835100b96d
Fixed some minor bugs -- the name of the incoming shared folder is parsed correctly, and xmppClient now catches bounce errors that were previously parsed as messages.
2008-06-13 16:20:43 -07:00
Atul Varma
92583fc5ff
Fixed an 'outstanding callbacks' warning and simplified the code a tiny bit.
2008-06-13 15:39:06 -07:00
Myk Melez
b12f3d03db
use nsIXMLHttpRequest::mozBackgroundRequest instead of DummyAuthProvider to suppress authentication dialogs and ensure XMLHttpRequests succeed even when the window that originated the request goes away
2008-06-13 13:08:36 -07:00
Dan Mills
589f3222eb
To avoid some async.js warnings: Turn some 'yield' calls into 'return' ones, and don't call 'self.cb' twice in a row when constructing event listeners for XHRs.
2008-06-13 15:49:18 +09:00
Dan Mills
9812ba557e
Make some 'debug' log calls into 'trace' ones. Use the frame formatter, which will remove long paths to extension dirs from the output. Don't warn about outstanding callbacks if we caught an exception from the generator.
2008-06-13 15:47:41 +09:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
5c8481de3d
Merged
2008-06-12 17:35:57 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
c548d4b940
Made the initialization of the xmppClient an asynchronous call. This included modifying xmppClient.js so that connect() can be passed a callback function that will get called once the connection has succeeded or failed. For most of our purposes this is probably a better API than what we had before where you call waitForConnection() and it busy-waits until the connection has succeeded or failed.
2008-06-12 17:35:44 -07:00
Myk Melez
b4967c8831
work around XmlHttpRequest bug 317600 by pausing for a 0ms timeout before trying to log in
2008-06-12 16:23:59 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
b462aad4a5
Merged changes.
2008-06-12 14:30:46 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
2b055a3b87
Fixed the server URL for xmpp connections.
2008-06-12 14:30:39 -07:00
Myk Melez
18d8e8fcd7
bug 410550: stop running scheduled sync when the user is not logged into weave
2008-06-12 12:36:58 -07:00
Atul Varma
9d32240087
Changed some of the debug() logging statements I added a few commits ago into trace() statemetns b/c they were drowning the log.
2008-06-12 12:00:19 -07:00
Myk Melez
f47209b9d2
only retrieve score once per engine when doing a scheduled sync, since retrieving the score can be a non-negligible cost for trackers that calculate the score on-demand (like the tab tracker)
2008-06-11 20:07:35 -07:00
Myk Melez
669e57136f
Automated merge with ssh://hg.mozilla.org/labs/weave/
2008-06-11 20:00:59 -07:00
Myk Melez
5d50fffd37
don't sync tab entry IDs, which change with every session, to avoid generating edit commands for every tab on restart even when the tabs haven't actually changed
2008-06-11 20:00:48 -07:00
Atul Varma
4864f07ae2
async.js now keeps track of how many outstanding callbacks it has and uses this information to log warnings about coroutines that may have yielded without an outstanding callback, and coroutines that may have finished while a callback is still outstanding. These are merely 'warnings' rather than certainties because this code assumes that there is a 1:1 correspondence between accesses to self.cb and yields, and also that self.cb's are actually passed to asynchronous functions. It'd be really cool if we could actually keep track of whether a callback got garbage collected before it was called or something, though I don't know how much it'd help in the end.
2008-06-11 19:19:16 -07:00
Atul Varma
7d98a5dbeb
Added a few log messages to hopefully make the debugging of generators easier. Also added an id component to generators, which is part of their name, to help distinguish between concurrent instances of the same generator function. The following debug output represents the new logging infomation:
...
--
Async.Generator DEBUG runTestGenerator-0: self.cb generated at test_async_missing_yield.js:28
Async.Generator DEBUG secondGen-1: self.cb generated at test_async_missing_yield.js:20
Async.Generator DEBUG secondGen-1: done() called.
Async.Generator DEBUG runTestGenerator-0: self.cb() called, resuming coroutine.
Async.Generator DEBUG runTestGenerator-0: done() called.
Async.Generator DEBUG secondGen-1: self.cb() called, resuming coroutine.
Async.Generator DEBUG secondGen-1: done() called.
Async.Generator ERROR Async method 'secondGen-1' is missing a 'yield' call (or called done() after being finalized)
--
As you can see, I've added log messages whenever the Generator's 'cb' property is accessed--this is almost guaranteed to be very close to a 'yield' statement, and therefore provides us with a decently accurate idea of where the generator 'stopped'. We also log a message when the generator continues, and by doing so we get an idea of how the coroutines interleave.
Another idea I had was to actually match calls to self.cb with calls to 'yield' to automatically detect e.g. two yields in a row (which will ordinarily result in a generator 'hanging'), a generator exiting while a self.cb still hasn't been called, but I'm not sure what kinds of reprecussions it may have.
2008-06-11 18:58:30 -07:00
Myk Melez
a850ec7b70
numChanged should be the number of shared items whose data is different, not the same
2008-06-11 18:47:56 -07:00
Atul Varma
28a0971380
Merged changes.
2008-06-11 18:03:11 -07:00
Atul Varma
78c2bba04d
Added test_async_missing_yield. It's very messy right now and duplicates code from other tests, but I've got some ideas about how to write better tests for async ops that I'll commit soon.
2008-06-11 18:02:46 -07:00
Maria Emerson
7da4259fee
bug 438033: implement a better first-run wizard process; r=myk
2008-06-11 17:56:02 -07:00